Title: [102512] trunk/Source/WebCore
- Revision
- 102512
- Author
- commit-qu...@webkit.org
- Date
- 2011-12-09 18:35:35 -0800 (Fri, 09 Dec 2011)
Log Message
[chromium] Prevent ASSERT in legitimate out-of-memory case.
https://bugs.webkit.org/show_bug.cgi?id=74215
Patch by Eric Penner <epen...@google.com> on 2011-12-09
Reviewed by James Robinson.
* platform/graphics/chromium/TiledLayerChromium.cpp:
(WebCore::TiledLayerChromium::updateCompositorResources):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102511 => 102512)
--- trunk/Source/WebCore/ChangeLog 2011-12-10 02:29:51 UTC (rev 102511)
+++ trunk/Source/WebCore/ChangeLog 2011-12-10 02:35:35 UTC (rev 102512)
@@ -1,3 +1,13 @@
+2011-12-09 Eric Penner <epen...@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 <a...@motorola.com>
NameNodeListCache should be invalidated when name attribute changes/modified.
Modified: trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (102511 => 102512)
--- trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp 2011-12-10 02:29:51 UTC (rev 102511)
+++ trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp 2011-12-10 02:35:35 UTC (rev 102512)
@@ -176,7 +176,7 @@
{
// 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.
if (m_skipsDraw || m_requestedUpdateRect.isEmpty() || !m_tiler || !m_tiler->numTiles())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
