Title: [134912] trunk/Source/WebKit2
- Revision
- 134912
- Author
- o...@webkit.org
- Date
- 2012-11-16 00:23:03 -0800 (Fri, 16 Nov 2012)
Log Message
[WK2] Bug on ASSERT code in CoordinatedBackingStore.cpp
https://bugs.webkit.org/show_bug.cgi?id=102465
Patch by KyungTae Kim <ktf....@samsung.com> on 2012-11-16
Reviewed by Noam Rosenthal.
The ASSERT code should be fixed because the 'operator>=' is not defined for WebCore::IntSize.
* UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp:
(WebKit::CoordinatedBackingStoreTile::swapBuffers):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (134911 => 134912)
--- trunk/Source/WebKit2/ChangeLog 2012-11-16 08:16:52 UTC (rev 134911)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-16 08:23:03 UTC (rev 134912)
@@ -1,3 +1,15 @@
+2012-11-16 KyungTae Kim <ktf....@samsung.com>
+
+ [WK2] Bug on ASSERT code in CoordinatedBackingStore.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=102465
+
+ Reviewed by Noam Rosenthal.
+
+ The ASSERT code should be fixed because the 'operator>=' is not defined for WebCore::IntSize.
+
+ * UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp:
+ (WebKit::CoordinatedBackingStoreTile::swapBuffers):
+
2012-11-16 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r134865.
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp (134911 => 134912)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp 2012-11-16 08:16:52 UTC (rev 134911)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp 2012-11-16 08:23:03 UTC (rev 134912)
@@ -49,7 +49,7 @@
shouldReset = true;
}
- ASSERT(textureMapper->maxTextureSize() >= std::max(m_tileRect.size().width(), m_tileRect.size().height()));
+ ASSERT(textureMapper->maxTextureSize().width() >= m_tileRect.size().width() && textureMapper->maxTextureSize().height() >= m_tileRect.size().height());
if (shouldReset)
texture->reset(m_tileRect.size(), m_surface->flags() & ShareableBitmap::SupportsAlpha ? BitmapTexture::SupportsAlpha : 0);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes