Title: [120533] trunk/Source/WebCore
Revision
120533
Author
[email protected]
Date
2012-06-16 15:22:03 -0700 (Sat, 16 Jun 2012)

Log Message

[Texmap] SIGSEV in WebCore::TextureMapperGL::drawTexture.
https://bugs.webkit.org/show_bug.cgi?id=89113

TextureMapperTile::m_texture is created lazilly, so we need null check before
using it.

Patch by Huang Dongsung <[email protected]> on 2012-06-16
Reviewed by Noam Rosenthal.

No new tests. This patch doesn't change behavior.

* platform/graphics/texmap/TextureMapperBackingStore.cpp:
(WebCore::TextureMapperTile::paint):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (120532 => 120533)


--- trunk/Source/WebCore/ChangeLog	2012-06-16 22:17:04 UTC (rev 120532)
+++ trunk/Source/WebCore/ChangeLog	2012-06-16 22:22:03 UTC (rev 120533)
@@ -1,5 +1,20 @@
 2012-06-16  Huang Dongsung  <[email protected]>
 
+        [Texmap] SIGSEV in WebCore::TextureMapperGL::drawTexture.
+        https://bugs.webkit.org/show_bug.cgi?id=89113
+
+        TextureMapperTile::m_texture is created lazilly, so we need null check before
+        using it.
+
+        Reviewed by Noam Rosenthal.
+
+        No new tests. This patch doesn't change behavior.
+
+        * platform/graphics/texmap/TextureMapperBackingStore.cpp:
+        (WebCore::TextureMapperTile::paint):
+
+2012-06-16  Huang Dongsung  <[email protected]>
+
         [Texmap] Remove unused code in Texmap.
         https://bugs.webkit.org/show_bug.cgi?id=89265
 

Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp (120532 => 120533)


--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp	2012-06-16 22:17:04 UTC (rev 120532)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp	2012-06-16 22:22:03 UTC (rev 120533)
@@ -89,7 +89,8 @@
 
 void TextureMapperTile::paint(TextureMapper* textureMapper, const TransformationMatrix& transform, float opacity, BitmapTexture* mask)
 {
-    textureMapper->drawTexture(*texture().get(), rect(), transform, opacity, mask);
+    if (texture().get())
+        textureMapper->drawTexture(*texture().get(), rect(), transform, opacity, mask);
 }
 
 TextureMapperTiledBackingStore::TextureMapperTiledBackingStore()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to