Title: [152390] trunk/Source/WebCore
- Revision
- 152390
- Author
- [email protected]
- Date
- 2013-07-03 23:44:59 -0700 (Wed, 03 Jul 2013)
Log Message
[Coordinated Graphics] Don't use && operator in ASSERT
https://bugs.webkit.org/show_bug.cgi?id=118377
Patch by Jae Hyun Park <[email protected]> on 2013-07-03
Reviewed by Noam Rosenthal.
We don't use && opeartor in ASSERT because it's impossible to know which
condition caused the assertion.
* platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp:
(WebCore::CoordinatedBackingStoreTile::swapBuffers):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152389 => 152390)
--- trunk/Source/WebCore/ChangeLog 2013-07-04 06:20:33 UTC (rev 152389)
+++ trunk/Source/WebCore/ChangeLog 2013-07-04 06:44:59 UTC (rev 152390)
@@ -1,3 +1,18 @@
+2013-07-03 Jae Hyun Park <[email protected]>
+
+ [Coordinated Graphics] Don't use && operator in ASSERT
+ https://bugs.webkit.org/show_bug.cgi?id=118377
+
+ Reviewed by Noam Rosenthal.
+
+ We don't use && opeartor in ASSERT because it's impossible to know which
+ condition caused the assertion.
+
+ * platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp:
+ (WebCore::CoordinatedBackingStoreTile::swapBuffers):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer):
+
2013-07-03 KyungTae Kim <[email protected]>
[EFL] Support some more editing keyboard events
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp (152389 => 152390)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp 2013-07-04 06:20:33 UTC (rev 152389)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp 2013-07-04 06:44:59 UTC (rev 152390)
@@ -47,7 +47,8 @@
shouldReset = true;
}
- ASSERT(textureMapper->maxTextureSize().width() >= m_tileRect.size().width() && textureMapper->maxTextureSize().height() >= m_tileRect.size().height());
+ ASSERT(textureMapper->maxTextureSize().width() >= m_tileRect.size().width());
+ ASSERT(textureMapper->maxTextureSize().height() >= m_tileRect.size().height());
if (shouldReset)
texture->reset(m_tileRect.size(), m_surface->supportsAlpha());
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (152389 => 152390)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2013-07-04 06:20:33 UTC (rev 152389)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2013-07-04 06:44:59 UTC (rev 152390)
@@ -135,7 +135,8 @@
purgeBackingStores();
m_coordinator->detachLayer(this);
}
- ASSERT(!m_coordinatedImageBacking && !m_mainBackingStore);
+ ASSERT(!m_coordinatedImageBacking);
+ ASSERT(!m_mainBackingStore);
willBeDestroyed();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
