Title: [175094] branches/safari-600.1.4.12-branch/Source/WebCore
- Revision
- 175094
- Author
- [email protected]
- Date
- 2014-10-23 00:15:43 -0700 (Thu, 23 Oct 2014)
Log Message
Merged r174846. rdar://problem/18742390
Modified Paths
Diff
Modified: branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog (175093 => 175094)
--- branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-23 07:08:26 UTC (rev 175093)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-23 07:15:43 UTC (rev 175094)
@@ -1,5 +1,24 @@
2014-10-23 Babak Shafiei <[email protected]>
+ Merge r174846.
+
+ 2014-10-17 Simon Fraser <[email protected]>
+
+ [iOS] Speculative fix for a crash under RenderLayerCompositor::updateScrollCoordinatedLayer()
+ https://bugs.webkit.org/show_bug.cgi?id=137837
+ rdar://problem/18545452
+
+ Reviewed by Tim Horton.
+
+ Crash logs suggest that an iframe's RenderView's RenderLayer's backing can be null
+ in a call to updateScrollCoordinatedLayer(), so add an assertion (to help find a reproducible case)
+ and a null check.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::attachScrollingNode):
+
+2014-10-23 Babak Shafiei <[email protected]>
+
Merge r174787.
2014-10-16 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-600.1.4.12-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (175093 => 175094)
--- branches/safari-600.1.4.12-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-23 07:08:26 UTC (rev 175093)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-23 07:15:43 UTC (rev 175094)
@@ -3655,6 +3655,10 @@
{
ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator();
RenderLayerBacking* backing = layer.backing();
+ // Crash logs suggest that backing can be null here, but we don't know how: rdar://problem/18545452.
+ ASSERT(backing);
+ if (!backing)
+ return 0;
ScrollingNodeID nodeID = backing->scrollingNodeIDForRole(nodeType);
if (!nodeID)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
