Title: [168445] trunk/Source/WebKit2
- Revision
- 168445
- Author
- simon.fra...@apple.com
- Date
- 2014-05-07 15:15:08 -0700 (Wed, 07 May 2014)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168444 => 168445)
--- trunk/Source/WebKit2/ChangeLog 2014-05-07 22:00:10 UTC (rev 168444)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-07 22:15:08 UTC (rev 168445)
@@ -1,3 +1,16 @@
+2014-05-07 Simon Fraser <simon.fra...@apple.com>
+
+ [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-07 Dan Bernstein <m...@apple.com>
<rdar://problem/16831276> [iOS] Unparenting a WKWebView that’s loading pauses it
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (168444 => 168445)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-07 22:00:10 UTC (rev 168444)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-07 22:15:08 UTC (rev 168445)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
