Title: [141833] trunk/Source/WebCore
Revision
141833
Author
[email protected]
Date
2013-02-04 16:54:34 -0800 (Mon, 04 Feb 2013)

Log Message

Coordinated Graphics: crash in TiledBackingStore::adjustForContentsRect
https://bugs.webkit.org/show_bug.cgi?id=107639

Patch by Seulgi Kim <[email protected]> on 2013-02-04
Reviewed by Kenneth Rohde Christiansen.

In TiledBackingStore::adjustForContentsRect method, inflating is not
needed when there is no intersections between the cover/keep rect and
the content rect.

No new tests, no change in functionality.

* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::adjustForContentsRect):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (141832 => 141833)


--- trunk/Source/WebCore/ChangeLog	2013-02-05 00:46:59 UTC (rev 141832)
+++ trunk/Source/WebCore/ChangeLog	2013-02-05 00:54:34 UTC (rev 141833)
@@ -1,3 +1,19 @@
+2013-02-04  Seulgi Kim  <[email protected]>
+
+        Coordinated Graphics: crash in TiledBackingStore::adjustForContentsRect
+        https://bugs.webkit.org/show_bug.cgi?id=107639
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        In TiledBackingStore::adjustForContentsRect method, inflating is not
+        needed when there is no intersections between the cover/keep rect and
+        the content rect.
+
+        No new tests, no change in functionality.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::adjustForContentsRect):
+
 2013-02-04  Stephen White  <[email protected]>
 
         [skia] Remove use of SkSingleInputImageFilter.

Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (141832 => 141833)


--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp	2013-02-05 00:46:59 UTC (rev 141832)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp	2013-02-05 00:54:34 UTC (rev 141833)
@@ -362,6 +362,25 @@
     if (rect.size() == candidateSize)
         return;
 
+    /*
+     * In the following case, there is no intersection of the contents rect and the cover/keep rect.
+     * Thus the latter should not be inflated.
+     *
+     *  +---------------+
+     *  |   m_rect      |
+     *  +---------------+
+     *
+     *          +-------------------------------+
+     *          |      cover or keep rect       |
+     *          |         +---------+           |
+     *          |         | visible |           |
+     *          |         |  rect   |           |
+     *          |         +---------+           |
+     *          +-------------------------------+
+     */
+    if (rect.isEmpty())
+        return;
+
     // Even now we might cover more than the content area so let's inflate in the
     // opposite directions.
     int pixelsCovered = candidateSize.width() * candidateSize.height();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to