Title: [242843] branches/safari-607-branch/Source/WebKit
Revision
242843
Author
[email protected]
Date
2019-03-13 00:05:30 -0700 (Wed, 13 Mar 2019)

Log 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

Modified Paths

Diff

Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (242842 => 242843)


--- branches/safari-607-branch/Source/WebKit/ChangeLog	2019-03-13 04:24:47 UTC (rev 242842)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog	2019-03-13 07:05:30 UTC (rev 242843)
@@ -1,3 +1,40 @@
+2019-03-12  Kocsen Chung  <[email protected]>
+
+        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  <[email protected]>
+
+            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  <[email protected]>
 
         Cherry-pick r242554. rdar://problem/48647490

Modified: branches/safari-607-branch/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm (242842 => 242843)


--- branches/safari-607-branch/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	2019-03-13 04:24:47 UTC (rev 242842)
+++ branches/safari-607-branch/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	2019-03-13 07:05:30 UTC (rev 242843)
@@ -102,6 +102,12 @@
         auto* node = nodeForID(layerID);
         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 });
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to