Title: [168759] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168758 => 168759)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 00:00:46 UTC (rev 168758)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 00:07:24 UTC (rev 168759)
@@ -1,5 +1,22 @@
2014-05-13 Lucas Forschler <[email protected]>
+ Merge r168445
+
+ 2014-05-07 Simon Fraser <[email protected]>
+
+ [iOS WK2] Speculative fix for crash in PlatformCALayerRemote::recursiveBuildTransaction
+ https://bugs.webkit.org/show_bug.cgi?id=132666
+
+ Reviewed by Tim Horton.
+
+ Crash reports suggest that owner() can be null. Assert and protect
+ against this.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::recursiveBuildTransaction):
+
+2014-05-13 Lucas Forschler <[email protected]>
+
Merge r168654
2014-05-12 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (168758 => 168759)
--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-14 00:00:46 UTC (rev 168758)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-14 00:07:24 UTC (rev 168759)
@@ -118,7 +118,8 @@
void PlatformCALayerRemote::recursiveBuildTransaction(RemoteLayerTreeTransaction& transaction)
{
- if (m_properties.backingStore && !owner()->platformCALayerDrawsContent()) {
+ ASSERT(owner());
+ if (m_properties.backingStore && (!owner() || !owner()->platformCALayerDrawsContent())) {
m_properties.backingStore = nullptr;
m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::BackingStoreChanged);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
