Title: [135697] trunk/Source/WebKit2
- Revision
- 135697
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-26 02:41:25 -0800 (Mon, 26 Nov 2012)
Log Message
REGRESSION(134142): ASSERT(!m_size.isZero()) hits in CoordinatedBackingStore::paintToTextureMapper().
https://bugs.webkit.org/show_bug.cgi?id=103217
Patch by Huang Dongsung <luxte...@company100.net> on 2012-11-26
Reviewed by Noam Rosenthal.
It is possible for CoordinatedBackingStore of directed composited image to not
have tiles, because CoordinatedImageBacking does not create tiles when the image
is invisible.
* UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp:
(WebKit::CoordinatedBackingStore::paintToTextureMapper):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (135696 => 135697)
--- trunk/Source/WebKit2/ChangeLog 2012-11-26 10:35:28 UTC (rev 135696)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-26 10:41:25 UTC (rev 135697)
@@ -1,3 +1,17 @@
+2012-11-26 Huang Dongsung <luxte...@company100.net>
+
+ REGRESSION(134142): ASSERT(!m_size.isZero()) hits in CoordinatedBackingStore::paintToTextureMapper().
+ https://bugs.webkit.org/show_bug.cgi?id=103217
+
+ Reviewed by Noam Rosenthal.
+
+ It is possible for CoordinatedBackingStore of directed composited image to not
+ have tiles, because CoordinatedImageBacking does not create tiles when the image
+ is invisible.
+
+ * UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp:
+ (WebKit::CoordinatedBackingStore::paintToTextureMapper):
+
2012-11-25 Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com>
[WK2] TiledBackingStore: page contents is scaled wrongly
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp (135696 => 135697)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp 2012-11-26 10:35:28 UTC (rev 135696)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp 2012-11-26 10:41:25 UTC (rev 135697)
@@ -140,6 +140,10 @@
void CoordinatedBackingStore::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& transform, float opacity, BitmapTexture* mask)
{
+ if (m_tiles.isEmpty())
+ return;
+ ASSERT(!m_size.isZero());
+
Vector<TextureMapperTile*> tilesToPaint;
Vector<TextureMapperTile*> previousTilesToPaint;
@@ -165,7 +169,6 @@
previousTilesToPaint.append(&tile);
}
- ASSERT(!m_size.isZero());
FloatRect rectOnContents(FloatPoint::zero(), m_size);
TransformationMatrix adjustedTransform = transform;
// targetRect is on the contents coordinate system, so we must compare two rects on the contents coordinate system.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
