Changeset 242843 in webkit

Timestamp:

Mar 13, 2019, 12:05:30 AM (7 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r242629. rdar://problem/48716552

Crash under RemoteLayerTreePropertyApplier::applyProperties
​https://bugs.webkit.org/show_bug.cgi?id=195448
<rdar://problem/48588226>

Reviewed by Simon Fraser.

• UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm: (WebKit::RemoteLayerTreeHost::updateLayerTree): Under some currently-unknown circumstances, the UI process is receiving commits referring to layers that it does not know about. One understood case of this was fixed in r241899, but there seem to be cases remaining that are not understood. Also, add a release log so that we can identify any downstream effects.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@242629 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm (modified) (1 diff)

branches/safari-607-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-12  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r242629. rdar://problem/48716552
+
+    Crash under RemoteLayerTreePropertyApplier::applyProperties
+    https://bugs.webkit.org/show_bug.cgi?id=195448
+    <rdar://problem/48588226>
+    
+    Reviewed by Simon Fraser.
+    
+    * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
+    (WebKit::RemoteLayerTreeHost::updateLayerTree):
+    Under some currently-unknown circumstances, the UI process is receiving
+    commits referring to layers that it does not know about.
+    One understood case of this was fixed in r241899, but there seem to be
+    cases remaining that are not understood.
+    Also, add a release log so that we can identify any downstream effects.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-07  Tim Horton  <timothy_horton@apple.com>
+
+            Crash under RemoteLayerTreePropertyApplier::applyProperties
+            https://bugs.webkit.org/show_bug.cgi?id=195448
+            <rdar://problem/48588226>
+
+            Reviewed by Simon Fraser.
+
+            * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
+            (WebKit::RemoteLayerTreeHost::updateLayerTree):
+            Under some currently-unknown circumstances, the UI process is receiving
+            commits referring to layers that it does not know about.
+            One understood case of this was fixed in r241899, but there seem to be
+            cases remaining that are not understood.
+            Also, add a release log so that we can identify any downstream effects.
+
 2019-03-06  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm

@@ -103 +103 @@
         ASSERT(node);
 
+        if (!node) {
+            // We have evidence that this can still happen, but don't know how (see r241899 for one already-fixed cause).
+            RELEASE_LOG_IF_ALLOWED("%p RemoteLayerTreeHost::updateLayerTree - failed to find layer with ID %llu", this, layerID);
+            continue;
+        }
+
         if (properties.changedProperties.contains(RemoteLayerTreeTransaction::ClonedContentsChanged) && properties.clonedLayerID)
             clonesToUpdate.append({ layerID, properties.clonedLayerID });