Title: [99095] trunk/Source/WebCore
- Revision
- 99095
- Author
- simon.fra...@apple.com
- Date
- 2011-11-02 14:02:07 -0700 (Wed, 02 Nov 2011)
Log Message
Assertion in FontCache::getCachedFontData() when painting into composited layer
https://bugs.webkit.org/show_bug.cgi?id=71377
Reviewed by Anders Carlsson.
Add one of the mysterious FontCachePurgePreventers on the stack when painting
compositing layers, just as FrameView::paintContents does, to fix an assertion
seen on the bots with some layout tests.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::paintIntoLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99094 => 99095)
--- trunk/Source/WebCore/ChangeLog 2011-11-02 21:01:18 UTC (rev 99094)
+++ trunk/Source/WebCore/ChangeLog 2011-11-02 21:02:07 UTC (rev 99095)
@@ -1,3 +1,17 @@
+2011-11-02 Simon Fraser <simon.fra...@apple.com>
+
+ Assertion in FontCache::getCachedFontData() when painting into composited layer
+ https://bugs.webkit.org/show_bug.cgi?id=71377
+
+ Reviewed by Anders Carlsson.
+
+ Add one of the mysterious FontCachePurgePreventers on the stack when painting
+ compositing layers, just as FrameView::paintContents does, to fix an assertion
+ seen on the bots with some layout tests.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintIntoLayer):
+
2011-11-02 Tommy Widenflycht <tom...@google.com>
MediaStreamRegistry should hold references to MediaStreamDescriptor rather than MediaStream
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (99094 => 99095)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-11-02 21:01:18 UTC (rev 99094)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-11-02 21:02:07 UTC (rev 99095)
@@ -34,6 +34,7 @@
#include "CSSPropertyNames.h"
#include "CSSStyleSelector.h"
#include "Chrome.h"
+#include "FontCache.h"
#include "FrameView.h"
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
@@ -1091,6 +1092,8 @@
ASSERT_NOT_REACHED();
return;
}
+
+ FontCachePurgePreventer fontCachePurgePreventer;
m_owningLayer->updateLayerListsIfNeeded();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
