Changeset 126889 in webkit

Timestamp:

Aug 28, 2012, 9:49:03 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Split some ASSERT(a && b && c) statements into separate lines.
​https://bugs.webkit.org/show_bug.cgi?id=95206

Patch by Iain Merrick <​husky@chromium.org> on 2012-08-28
Reviewed by James Robinson.

This makes for easier debugging, as you can immediately see which clause
has failed.

No change in behavior, no new tests needed.

• platform/graphics/chromium/cc/CCResourceProvider.cpp:

(WebCore::CCResourceProvider::deleteResource):
(WebCore::CCResourceProvider::upload):
(WebCore::CCResourceProvider::lockForRead):
(WebCore::CCResourceProvider::unlockForRead):
(WebCore::CCResourceProvider::lockForWrite):
(WebCore::CCResourceProvider::unlockForWrite):
(WebCore::CCResourceProvider::transferResource):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/cc/CCResourceProvider.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-28  Iain Merrick  <husky@chromium.org>
+
+        [chromium] Split some ASSERT(a && b && c) statements into separate lines.
+        https://bugs.webkit.org/show_bug.cgi?id=95206
+
+        Reviewed by James Robinson.
+
+        This makes for easier debugging, as you can immediately see which clause
+        has failed.
+
+        No change in behavior, no new tests needed.
+
+        * platform/graphics/chromium/cc/CCResourceProvider.cpp:
+        (WebCore::CCResourceProvider::deleteResource):
+        (WebCore::CCResourceProvider::upload):
+        (WebCore::CCResourceProvider::lockForRead):
+        (WebCore::CCResourceProvider::unlockForRead):
+        (WebCore::CCResourceProvider::lockForWrite):
+        (WebCore::CCResourceProvider::unlockForWrite):
+        (WebCore::CCResourceProvider::transferResource):
+
 2012-08-28  Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp

@@ -155 +155 @@
     ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
-    ASSERT(it != m_resources.end() && !it->second.lockedForWrite && !it->second.lockForReadCount);
+    ASSERT(it != m_resources.end());
+    ASSERT(!it->second.lockedForWrite);
+    ASSERT(!it->second.lockForReadCount);
 
     if (it->second.glId && !it->second.external) {
@@ -191 +193 @@
     ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
-    ASSERT(it != m_resources.end() && !it->second.lockedForWrite && !it->second.lockForReadCount && !it->second.external);
+    ASSERT(it != m_resources.end());
+    ASSERT(!it->second.lockedForWrite);
+    ASSERT(!it->second.lockForReadCount);
+    ASSERT(!it->second.external);
 
     if (it->second.glId) {
@@ -239 +244 @@
     ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
-    ASSERT(it != m_resources.end() && !it->second.lockedForWrite);
+    ASSERT(it != m_resources.end());
+    ASSERT(!it->second.lockedForWrite);
     it->second.lockForReadCount++;
     return &it->second;
@@ -248 +254 @@
     ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
-    ASSERT(it != m_resources.end() && it->second.lockForReadCount > 0);
+    ASSERT(it != m_resources.end());
+    ASSERT(it->second.lockForReadCount > 0);
     it->second.lockForReadCount--;
 }
@@ -256 +263 @@
     ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
-    ASSERT(it != m_resources.end() && !it->second.lockedForWrite && !it->second.lockForReadCount && !it->second.external);
+    ASSERT(it != m_resources.end());
+    ASSERT(!it->second.lockedForWrite);
+    ASSERT(!it->second.lockForReadCount);
+    ASSERT(!it->second.external);
     it->second.lockedForWrite = true;
     return &it->second;
@@ -265 +275 @@
     ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
-    ASSERT(it != m_resources.end() && it->second.lockedForWrite && !it->second.external);
+    ASSERT(it != m_resources.end());
+    ASSERT(it->second.lockedForWrite);
+    ASSERT(!it->second.external);
     it->second.lockedForWrite = false;
 }
@@ -506 +518 @@
     ASSERT(CCProxy::isImplThread());
     ResourceMap::const_iterator it = m_resources.find(id);
-    ASSERT(it != m_resources.end() && !it->second.lockedForWrite && !it->second.lockForReadCount && !it->second.external);
+    ASSERT(it != m_resources.end());
+    ASSERT(!it->second.lockedForWrite);
+    ASSERT(!it->second.lockForReadCount);
+    ASSERT(!it->second.external);
     if (it->second.exported)
         return false;