Title: [131007] trunk/Source/WebCore
- Revision
- 131007
- Author
- bda...@apple.com
- Date
- 2012-10-10 20:41:21 -0700 (Wed, 10 Oct 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=98984
REGRESSION: Crash happens after we add non-top-level frame to the
ScrollingStateTree
Reviewed by Simon Fraser.
isRootLayer() can return true for layers that do not correspond to
the main frame. But we only want the ones that DO correspond to the
main frame!
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateBacking):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131006 => 131007)
--- trunk/Source/WebCore/ChangeLog 2012-10-11 03:39:51 UTC (rev 131006)
+++ trunk/Source/WebCore/ChangeLog 2012-10-11 03:41:21 UTC (rev 131007)
@@ -1,3 +1,17 @@
+2012-10-10 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=98984
+ REGRESSION: Crash happens after we add non-top-level frame to the
+ ScrollingStateTree
+
+ Reviewed by Simon Fraser.
+
+ isRootLayer() can return true for layers that do not correspond to
+ the main frame. But we only want the ones that DO correspond to the
+ main frame!
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateBacking):
+
2012-10-10 Dan Bernstein <m...@apple.com>
<rdar://problem/12472460> text-combine doesn’t use third- and quarter-width variants when used with @font-face
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (131006 => 131007)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-10-11 03:39:51 UTC (rev 131006)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-10-11 03:41:21 UTC (rev 131007)
@@ -494,7 +494,8 @@
layer->ensureBacking();
- if (layer->isRootLayer()) {
+ // At this time, the ScrollingCooridnator only supports the top-level frame.
+ if (layer->isRootLayer() && !m_renderView->document()->ownerElement()) {
layer->backing()->attachToScrollingCoordinator();
if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
scrollingCoordinator->frameViewRootLayerDidChange(m_renderView->frameView());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
