[webkit-changes] [126889] trunk/Source/WebCore

Tue, 28 Aug 2012 09:48:22 -0700

Title: [126889] trunk/Source/WebCore
Revision
126889
Author
[email protected]
Date
2012-08-28 09:49:03 -0700 (Tue, 28 Aug 2012)

Log 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 <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (126888 => 126889)


--- trunk/Source/WebCore/ChangeLog	2012-08-28 16:30:49 UTC (rev 126888)
+++ trunk/Source/WebCore/ChangeLog	2012-08-28 16:49:03 UTC (rev 126889)
@@ -1,3 +1,24 @@
+2012-08-28  Iain Merrick  <[email protected]>
+
+        [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  <[email protected]>
 
         [Chrome] Enable track by default.

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp (126888 => 126889)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp	2012-08-28 16:30:49 UTC (rev 126888)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp	2012-08-28 16:49:03 UTC (rev 126889)
@@ -154,7 +154,9 @@
 {
     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) {
         WebGraphicsContext3D* context3d = m_context->context3D();
@@ -190,7 +192,10 @@
 {
     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) {
         WebGraphicsContext3D* context3d = m_context->context3D();
@@ -238,7 +243,8 @@
 {
     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;
 }
@@ -247,7 +253,8 @@
 {
     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--;
 }
 
@@ -255,7 +262,10 @@
 {
     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;
 }
@@ -264,7 +274,9 @@
 {
     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;
 }
 
@@ -505,7 +517,10 @@
 {
     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;
     resource->id = id;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to