Changeset 102512 in webkit

Timestamp:

Dec 9, 2011 6:35:35 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Prevent ASSERT in legitimate out-of-memory case.
​https://bugs.webkit.org/show_bug.cgi?id=74215

Patch by Eric Penner <​epenner@google.com> on 2011-12-09
Reviewed by James Robinson.

• platform/graphics/chromium/TiledLayerChromium.cpp:

(WebCore::TiledLayerChromium::updateCompositorResources):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/TiledLayerChromium.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-09  Eric Penner  <epenner@google.com>
+
+        [chromium] Prevent ASSERT in legitimate out-of-memory case.
+        https://bugs.webkit.org/show_bug.cgi?id=74215
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/chromium/TiledLayerChromium.cpp:
+        (WebCore::TiledLayerChromium::updateCompositorResources):
+
 2011-12-09   Arko Saha  <arko@motorola.com>
 

trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp

@@ -177 +177 @@
     // If this assert is hit, it means that paintContentsIfDirty hasn't been
     // called on this layer. Any layer that is updated should be painted first.
-    ASSERT(m_tiler);
+    ASSERT(m_skipsDraw || m_tiler);
 
     // Painting could cause compositing to get turned off, which may cause the tiler to become invalidated mid-update.