Title: [212055] branches/safari-603-branch/Source/WebCore
- Revision
- 212055
- Author
- matthew_han...@apple.com
- Date
- 2017-02-09 22:36:25 -0800 (Thu, 09 Feb 2017)
Log Message
Merge r211730. rdar://problem/30251840
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212054 => 212055)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 06:36:23 UTC (rev 212054)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 06:36:25 UTC (rev 212055)
@@ -1,5 +1,26 @@
2017-02-09 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211730. rdar://problem/30251840
+
+ 2017-02-06 Antti Koivisto <an...@apple.com>
+
+ CrashTracer: com.apple.WebKit.WebContent at WebCore: WebCore::Node::invalidateStyle
+ https://bugs.webkit.org/show_bug.cgi?id=167878
+ rdar://problem/30251840
+
+ Reviewed by Andreas Kling.
+
+ Speculative fix.
+
+ We are trying to invalidate a null node from ~PostResolutionCallbackDisabler. Looks like the only way
+ this could happen is if HTMLFrameOwnerElement::scheduleinvalidateStyleAndLayerComposition is called
+ with null 'this'. There is one place where this might happen.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::attachRootLayer): Add null check.
+
+2017-02-09 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211667. rdar://problem/28193222
2017-02-03 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (212054 => 212055)
--- branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-10 06:36:23 UTC (rev 212054)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-10 06:36:25 UTC (rev 212055)
@@ -3518,7 +3518,8 @@
case RootLayerAttachedViaEnclosingFrame: {
// The layer will get hooked up via RenderLayerBacking::updateConfiguration()
// for the frame's renderer in the parent document.
- m_renderView.document().ownerElement()->scheduleinvalidateStyleAndLayerComposition();
+ if (auto* ownerElement = m_renderView.document().ownerElement())
+ ownerElement->scheduleinvalidateStyleAndLayerComposition();
break;
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
