Title: [236777] trunk
Revision
236777
Author
[email protected]
Date
2018-10-02 17:25:10 -0700 (Tue, 02 Oct 2018)

Log Message

Web Inspector: prevent layer events from firing until the layer information is re-requested
https://bugs.webkit.org/show_bug.cgi?id=190159

Reviewed by Joseph Pecoraro.

Source/WebCore:

Test: inspector/layers/layerTreeDidChange.html

* inspector/agents/InspectorLayerTreeAgent.h:
* inspector/agents/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::reset):
(WebCore::InspectorLayerTreeAgent::layerTreeDidChange):
(WebCore::InspectorLayerTreeAgent::layersForNode):

Source/WebInspectorUI:

* UserInterface/Controllers/LayerTreeManager.js:
(WI.LayerTreeManager):
(WI.LayerTreeManager.prototype.get supported):
Remove `supported` member variable in favor of re-evaluating its value.

* UserInterface/Protocol/LayerTreeObserver.js:
(WI.LayerTreeObserver.prototype.layerTreeDidChange):

LayoutTests:

* inspector/layers/layerTreeDidChange-expected.txt: Added.
* inspector/layers/layerTreeDidChange.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (236776 => 236777)


--- trunk/LayoutTests/ChangeLog	2018-10-03 00:21:57 UTC (rev 236776)
+++ trunk/LayoutTests/ChangeLog	2018-10-03 00:25:10 UTC (rev 236777)
@@ -1,5 +1,15 @@
 2018-10-02  Devin Rousso  <[email protected]>
 
+        Web Inspector: prevent layer events from firing until the layer information is re-requested
+        https://bugs.webkit.org/show_bug.cgi?id=190159
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/layers/layerTreeDidChange-expected.txt: Added.
+        * inspector/layers/layerTreeDidChange.html: Added.
+
+2018-10-02  Devin Rousso  <[email protected]>
+
         Web Inspector: rename frontend managers to be more consistent with backend agents
         https://bugs.webkit.org/show_bug.cgi?id=190160
 

Added: trunk/LayoutTests/inspector/layers/layerTreeDidChange-expected.txt (0 => 236777)


--- trunk/LayoutTests/inspector/layers/layerTreeDidChange-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/inspector/layers/layerTreeDidChange-expected.txt	2018-10-03 00:25:10 UTC (rev 236777)
@@ -0,0 +1,17 @@
+Tests for LayerTree.event.layerTreeDidChange.
+
+
+== Running test suite: LayerTree.layerTreeDidChange
+-- Running test case: LayerTree.layerTreeDidChange.WithRequest
+Creating layer...
+Layer tree changed
+Creating layer...
+Layer tree changed
+PASS: LayerTreeDidChange should fire after layersForNode is called
+
+-- Running test case: LayerTree.layerTreeDidChange.WithoutRequest
+Creating layer...
+Layer tree changed
+Creating layer...
+PASS: LayerTreeDidChange should not fire before layersForNode is called
+

Added: trunk/LayoutTests/inspector/layers/layerTreeDidChange.html (0 => 236777)


--- trunk/LayoutTests/inspector/layers/layerTreeDidChange.html	                        (rev 0)
+++ trunk/LayoutTests/inspector/layers/layerTreeDidChange.html	2018-10-03 00:25:10 UTC (rev 236777)
@@ -0,0 +1,122 @@
+<!doctype html>
+<html>
+<head>
+<script src=""
+<script>
+
+function addCompositedLayer()
+{
+    var element = document.createElement("div");
+    element.className = "composited";
+    element.id = "last-element";
+    document.body.appendChild(element);
+
+    requestAnimationFrame(() => {
+        TestPage.dispatchEventToFrontend("TestPageDidAppendChild");
+    });
+};
+
+function test()
+{
+    let documentNode = null;
+
+    let suite = InspectorTest.createAsyncSuite("LayerTree.layerTreeDidChange");
+
+    suite.addTestCase({
+        name: "LayerTree.layerTreeDidChange.WithRequest",
+        description: "Check that layerTreeDidChange is able to be dispatched once LayerTree.commands.layersForNode is called.",
+        test(resolve, reject) {
+            let layerTreeDidChangeCount = 0;
+            let handleLayerTreeDidChange = WI.layerTreeManager.addEventListener(WI.LayerTreeManager.Event.LayerTreeDidChange, (event) => {
+                ++layerTreeDidChangeCount;
+
+                InspectorTest.log("Layer tree changed");
+
+                if (layerTreeDidChangeCount === 1) {
+                    WI.layerTreeManager.layersForNode(documentNode, (layers) => {
+                        InspectorTest.log("Creating layer...");
+                        InspectorTest.evaluateInPage(`addCompositedLayer()`);
+                    });
+                }
+            });
+
+            let testPageDidAppendChildCount = 0;
+            let handleTestPageDidAppendChild = InspectorTest.addEventListener("TestPageDidAppendChild", (event) => {
+                ++testPageDidAppendChildCount;
+
+                if (testPageDidAppendChildCount === 2) {
+                    WI.layerTreeManager.removeEventListener(WI.LayerTreeManager.Event.LayerTreeDidChange, handleLayerTreeDidChange);
+                    InspectorTest.removeEventListener("TestPageDidAppendChild", handleTestPageDidAppendChild);
+
+                    InspectorTest.expectEqual(layerTreeDidChangeCount, 2, "LayerTreeDidChange should fire after layersForNode is called");
+
+                    resolve();
+                }
+            });
+
+            WI.layerTreeManager.layersForNode(documentNode, (layers) => {
+                InspectorTest.log("Creating layer...");
+                InspectorTest.evaluateInPage(`addCompositedLayer()`);
+            });
+        },
+    });
+
+    suite.addTestCase({
+        name: "LayerTree.layerTreeDidChange.WithoutRequest",
+        description: "Check that layerTreeDidChange doesn't dispatch more than once until LayerTree.commands.layersForNode is called.",
+        test(resolve, reject) {
+            let layerTreeDidChangeCount = 0;
+            let handleLayerTreeDidChange = WI.layerTreeManager.addEventListener(WI.LayerTreeManager.Event.LayerTreeDidChange, (event) => {
+                ++layerTreeDidChangeCount;
+
+                InspectorTest.log("Layer tree changed");
+
+                if (layerTreeDidChangeCount === 1) {
+                    InspectorTest.log("Creating layer...");
+                    InspectorTest.evaluateInPage(`addCompositedLayer()`);
+                }
+            });
+
+            let testPageDidAppendChildCount = 0;
+            let handleTestPageDidAppendChild = InspectorTest.addEventListener("TestPageDidAppendChild", (event) => {
+                ++testPageDidAppendChildCount;
+
+                if (testPageDidAppendChildCount === 2) {
+                    WI.layerTreeManager.removeEventListener(WI.LayerTreeManager.Event.LayerTreeDidChange, handleLayerTreeDidChange);
+                    InspectorTest.removeEventListener("TestPageDidAppendChild", handleTestPageDidAppendChild);
+
+                    InspectorTest.expectEqual(layerTreeDidChangeCount, 1, "LayerTreeDidChange should not fire before layersForNode is called");
+
+                    resolve();
+                }
+            });
+
+            WI.layerTreeManager.layersForNode(documentNode, (layers) => {
+                InspectorTest.log("Creating layer...");
+                InspectorTest.evaluateInPage(`addCompositedLayer()`);
+            });
+        },
+    });
+
+    WI.domManager.requestDocument((node) => {
+        documentNode = node;
+        if (!documentNode) {
+            InspectorTest.fail("Missing document node.");
+            InspectorTest.completeTest();
+            return;
+        }
+
+        suite.runTestCasesAndFinish();
+    });
+}
+</script>
+<style>
+.composited {
+    -webkit-transform: translateZ(0);
+}
+</style>
+</head>
+<body _onload_="runTest()">
+<p>Tests for LayerTree.event.layerTreeDidChange.</p>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (236776 => 236777)


--- trunk/Source/WebCore/ChangeLog	2018-10-03 00:21:57 UTC (rev 236776)
+++ trunk/Source/WebCore/ChangeLog	2018-10-03 00:25:10 UTC (rev 236777)
@@ -1,3 +1,18 @@
+2018-10-02  Devin Rousso  <[email protected]>
+
+        Web Inspector: prevent layer events from firing until the layer information is re-requested
+        https://bugs.webkit.org/show_bug.cgi?id=190159
+
+        Reviewed by Joseph Pecoraro.
+
+        Test: inspector/layers/layerTreeDidChange.html
+
+        * inspector/agents/InspectorLayerTreeAgent.h:
+        * inspector/agents/InspectorLayerTreeAgent.cpp:
+        (WebCore::InspectorLayerTreeAgent::reset):
+        (WebCore::InspectorLayerTreeAgent::layerTreeDidChange):
+        (WebCore::InspectorLayerTreeAgent::layersForNode):
+
 2018-10-02  Brian Burg  <[email protected]>
 
         Web Automation: tab default key handler should always cycle focus when page is controlled by automation

Modified: trunk/Source/WebCore/inspector/agents/InspectorLayerTreeAgent.cpp (236776 => 236777)


--- trunk/Source/WebCore/inspector/agents/InspectorLayerTreeAgent.cpp	2018-10-03 00:21:57 UTC (rev 236776)
+++ trunk/Source/WebCore/inspector/agents/InspectorLayerTreeAgent.cpp	2018-10-03 00:25:10 UTC (rev 236777)
@@ -74,6 +74,7 @@
     m_idToLayer.clear();
     m_pseudoElementToIdMap.clear();
     m_idToPseudoElement.clear();
+    m_suppressLayerChangeEvents = false;
 }
 
 void InspectorLayerTreeAgent::enable(ErrorString&)
@@ -88,6 +89,11 @@
 
 void InspectorLayerTreeAgent::layerTreeDidChange()
 {
+    if (m_suppressLayerChangeEvents)
+        return;
+
+    m_suppressLayerChangeEvents = true;
+
     m_frontendDispatcher->layerTreeDidChange();
 }
 
@@ -117,8 +123,12 @@
         return;
     }
 
-    if (is<RenderElement>(*renderer))
-        gatherLayersUsingRenderObjectHierarchy(errorString, downcast<RenderElement>(*renderer), layers);
+    if (!is<RenderElement>(*renderer))
+        return;
+
+    gatherLayersUsingRenderObjectHierarchy(errorString, downcast<RenderElement>(*renderer), layers);
+
+    m_suppressLayerChangeEvents = false;
 }
 
 void InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy(ErrorString& errorString, RenderElement& renderer, RefPtr<JSON::ArrayOf<Inspector::Protocol::LayerTree::Layer>>& layers)

Modified: trunk/Source/WebCore/inspector/agents/InspectorLayerTreeAgent.h (236776 => 236777)


--- trunk/Source/WebCore/inspector/agents/InspectorLayerTreeAgent.h	2018-10-03 00:21:57 UTC (rev 236776)
+++ trunk/Source/WebCore/inspector/agents/InspectorLayerTreeAgent.h	2018-10-03 00:25:10 UTC (rev 236777)
@@ -90,6 +90,8 @@
 
     HashMap<PseudoElement*, String> m_pseudoElementToIdMap;
     HashMap<String, PseudoElement*> m_idToPseudoElement;
+
+    bool m_suppressLayerChangeEvents { false };
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebInspectorUI/ChangeLog (236776 => 236777)


--- trunk/Source/WebInspectorUI/ChangeLog	2018-10-03 00:21:57 UTC (rev 236776)
+++ trunk/Source/WebInspectorUI/ChangeLog	2018-10-03 00:25:10 UTC (rev 236777)
@@ -1,5 +1,20 @@
 2018-10-02  Devin Rousso  <[email protected]>
 
+        Web Inspector: prevent layer events from firing until the layer information is re-requested
+        https://bugs.webkit.org/show_bug.cgi?id=190159
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Controllers/LayerTreeManager.js:
+        (WI.LayerTreeManager):
+        (WI.LayerTreeManager.prototype.get supported):
+        Remove `supported` member variable in favor of re-evaluating its value.
+
+        * UserInterface/Protocol/LayerTreeObserver.js:
+        (WI.LayerTreeObserver.prototype.layerTreeDidChange):
+
+2018-10-02  Devin Rousso  <[email protected]>
+
         Web Inspector: REGRESSION(r236766): WI.IssueManager no longer exists
         https://bugs.webkit.org/show_bug.cgi?id=190226
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/LayerTreeManager.js (236776 => 236777)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LayerTreeManager.js	2018-10-03 00:21:57 UTC (rev 236776)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LayerTreeManager.js	2018-10-03 00:25:10 UTC (rev 236777)
@@ -29,9 +29,7 @@
     {
         super();
 
-        this._supported = !!window.LayerTreeAgent;
-
-        if (this._supported)
+        if (window.LayerTreeAgent)
             LayerTreeAgent.enable();
     }
 
@@ -39,7 +37,7 @@
 
     get supported()
     {
-        return this._supported;
+        return !!window.LayerTreeAgent;
     }
 
     layerTreeMutations(previousLayers, newLayers)

Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/LayerTreeObserver.js (236776 => 236777)


--- trunk/Source/WebInspectorUI/UserInterface/Protocol/LayerTreeObserver.js	2018-10-03 00:21:57 UTC (rev 236776)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/LayerTreeObserver.js	2018-10-03 00:25:10 UTC (rev 236777)
@@ -29,7 +29,6 @@
 
     layerTreeDidChange()
     {
-        if (WI.layerTreeManager.supported)
-            WI.layerTreeManager.layerTreeDidChange();
+        WI.layerTreeManager.layerTreeDidChange();
     }
 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to