Changeset 168445 in webkit

Timestamp:

May 7, 2014 3:15:08 PM (10 years ago)

Author:

Simon Fraser

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-07  Simon Fraser  <simon.fraser@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  <mitz@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

@@ -119 +119 @@
 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);