Attachment 369775 Details for Bug 174272 – Patch

[patch] Patch

bug-174272-20190513132914.patch (text/plain), 7.06 KB, created by Devin Rousso on 2019-05-13 13:29:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-05-13 13:29:14 PDT

Size: 7.06 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8848d916c96fc9f5bcef74dd9b26f80cd7b61e43..8ba5f9332b53ee4255ba4d6676d4b7724ea7dde2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-13  Devin Rousso  <drousso@apple.com>
>+
>+        LayoutTest inspector/canvas/css-canvas-clients.html is a flaky timeout
>+        https://bugs.webkit.org/show_bug.cgi?id=174272
>+        <rdar://problem/49709077>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: inspector/canvas/css-canvas-clients.html
>+
>+        * css/CSSCanvasValue.h:
>+        * css/CSSImageGeneratorValue.cpp:
>+        (WebCore::CSSImageGeneratorValue::addClient):
>+        (WebCore::CSSImageGeneratorValue::removeClient):
>+        Force the `CSSCanvasValue` to fetch the related `HTMLCanvasElement` so that Web Inspector is
>+        able to see it.
>+
> 2019-05-13  Antti Koivisto  <antti@apple.com>
> 
>         REGRESSION (r245208): compositing/shared-backing/sharing-bounds-non-clipping-shared-layer.html asserts
>diff --git a/Source/WebCore/css/CSSCanvasValue.h b/Source/WebCore/css/CSSCanvasValue.h
>index 74f8762a3874ef7ecfdfad351bb3f2ee1bddc1d6..def5f2bcff36bcea212debf7dd79a434efa7fa26 100644
>--- a/Source/WebCore/css/CSSCanvasValue.h
>+++ b/Source/WebCore/css/CSSCanvasValue.h
>@@ -46,6 +46,7 @@ public:
>     FloatSize fixedSize(const RenderElement*);
> 
>     HTMLCanvasElement* element() const { return m_element; }
>+    HTMLCanvasElement* element(Document&);
> 
>     bool isPending() const { return false; }
>     void loadSubimages(CachedResourceLoader&, const ResourceLoaderOptions&) { }
>@@ -97,8 +98,6 @@ private:
>     void canvasResized(HTMLCanvasElement&);
>     void canvasDestroyed(HTMLCanvasElement&);
> 
>-    HTMLCanvasElement* element(Document&);
>-
>     CanvasObserverProxy m_canvasObserver;
> 
>     // The name of the canvas.
>diff --git a/Source/WebCore/css/CSSImageGeneratorValue.cpp b/Source/WebCore/css/CSSImageGeneratorValue.cpp
>index ffdd3d0aa657f25eaf31d570c5868ed5309e2efd..4c188bd88b727d9c156e922c38c03db226640fba 100644
>--- a/Source/WebCore/css/CSSImageGeneratorValue.cpp
>+++ b/Source/WebCore/css/CSSImageGeneratorValue.cpp
>@@ -74,7 +74,7 @@ void CSSImageGeneratorValue::addClient(RenderElement& renderer)
>     m_clients.add(&renderer);
> 
>     if (is<CSSCanvasValue>(this)) {
>-        if (HTMLCanvasElement* canvasElement = downcast<CSSCanvasValue>(this)->element())
>+        if (HTMLCanvasElement* canvasElement = downcast<CSSCanvasValue>(this)->element(renderer.document()))
>             InspectorInstrumentation::didChangeCSSCanvasClientNodes(*canvasElement);
>     }
> }
>@@ -86,7 +86,7 @@ void CSSImageGeneratorValue::removeClient(RenderElement& renderer)
>         return;
> 
>     if (is<CSSCanvasValue>(this)) {
>-        if (HTMLCanvasElement* canvasElement = downcast<CSSCanvasValue>(this)->element())
>+        if (HTMLCanvasElement* canvasElement = downcast<CSSCanvasValue>(this)->element(renderer.document()))
>             InspectorInstrumentation::didChangeCSSCanvasClientNodes(*canvasElement);
>     }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 1f22cab067665509f753132f185a2989de447368..165dfebfd0b58f518cd9537cb1056d9911dbecff 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-13  Devin Rousso  <drousso@apple.com>
>+
>+        LayoutTest inspector/canvas/css-canvas-clients.html is a flaky timeout
>+        https://bugs.webkit.org/show_bug.cgi?id=174272
>+        <rdar://problem/49709077>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * inspector/canvas/css-canvas-clients.html:
>+        * inspector/canvas/css-canvas-clients-expected.txt:
>+        * platform/mac/TestExpectations:
>+
> 2019-05-13  Antti Koivisto  <antti@apple.com>
> 
>         REGRESSION (r245208): compositing/shared-backing/sharing-bounds-non-clipping-shared-layer.html asserts
>diff --git a/LayoutTests/inspector/canvas/css-canvas-clients-expected.txt b/LayoutTests/inspector/canvas/css-canvas-clients-expected.txt
>index 9aeb3fdc69474e8165811209b2341b6b1b823f5b..88828866f530cd1f6e55f0304b1054d5ebd85d1e 100644
>--- a/LayoutTests/inspector/canvas/css-canvas-clients-expected.txt
>+++ b/LayoutTests/inspector/canvas/css-canvas-clients-expected.txt
>@@ -10,7 +10,7 @@ PASS: There should be no client nodes.
> -- Running test case: Canvas.CSSCanvasClients.Create
> PASS: Canvas with created client should have CSS name "css-canvas".
> PASS: There should be one client node.
>-PASS: Client node "div" is valid.
>+PASS: Client node "div.css-canvas-client" is valid.
> 
> -- Running test case: Canvas.CSSCanvasClients.Destroy
> PASS: Canvas with destroyed client should have CSS name "css-canvas".
>diff --git a/LayoutTests/inspector/canvas/css-canvas-clients.html b/LayoutTests/inspector/canvas/css-canvas-clients.html
>index 7fbaf6a2c207e199034be0ddf6ad1d4899e90cb1..474409cd00bac264475006055d347a53b4bc035e 100644
>--- a/LayoutTests/inspector/canvas/css-canvas-clients.html
>+++ b/LayoutTests/inspector/canvas/css-canvas-clients.html
>@@ -4,7 +4,11 @@
> <script src="../../http/tests/inspector/resources/inspector-test.js"></script>
> <script>
> function load() {
>-    window.context2d = document.getCSSCanvasContext("2d", "css-canvas", 10, 10);
>+    window.cssCanvasContext2d = document.getCSSCanvasContext("2d", "css-canvas", 10, 10);
>+    if (!window.cssCanvasContext2d)
>+        TestPage.addResult(`FAIL: unable to initialize cssCanvasContext2d.`)
>+    else if (!(window.cssCanvasContext2d instanceof CanvasRenderingContext2D))
>+        TestPage.addResult(`FAIL: cssCanvasContext2d is a ${window.cssCanvasContext2d.constructor.name} instead of a CanvasRenderingContext2D.`)
> 
>     runTest();
> }
>@@ -12,7 +16,9 @@ function load() {
> let cssCanvasClients = [];
> 
> function createCSSCanvasClient() {
>-    cssCanvasClients.push(document.body.appendChild(document.createElement("div")));
>+    let div = document.body.appendChild(document.createElement("div"));
>+    div.classList.add("css-canvas-client");
>+    cssCanvasClients.push(div);
> }
> 
> function destroyCSSCanvasClients() {
>@@ -111,7 +117,7 @@ function test() {
> }
> </script>
> <style>
>-    div {
>+    .css-canvas-client {
>         width: 10px;
>         height: 10px;
>         background-image: -webkit-canvas(css-canvas);
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index f273f6d3d8e2c2a6a60453728d5b8e88e06f1b7b..8c35987da178c4e51b36d87ea765794fb94e7105 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1031,7 +1031,6 @@ webkit.org/b/150978 fast/canvas/webgl/oes-texture-half-float-linear.html [ Pass
> webkit.org/b/173931 inspector/canvas/context-attributes.html [ Pass Timeout ]
> webkit.org/b/178028 inspector/canvas/create-context-2d.html [ Pass Timeout ]
> webkit.org/b/174066 inspector/canvas/create-context-webgl2.html [ Pass Timeout ]
>-webkit.org/b/174272 inspector/canvas/css-canvas-clients.html [ Pass Failure ]
> webkit.org/b/174066 inspector/canvas/recording-webgl2.html [ Pass Failure Timeout ]
> webkit.org/b/174066 inspector/canvas/recording-webgl2-snapshots.html [ Pass Failure Timeout ]
> webkit.org/b/174066 inspector/canvas/shaderProgram-add-remove-webgl2.html [ Pass Failure Timeout ]

Actions: View | Formatted Diff | Diff

Attachments on bug 174272: 369660 | 369661 | 369665 | 369666 | 369682 | 369689 | 369691 | 369693 | 369696 | 369697 | 369701 | 369703 | 369704 | 369705 | 369706 | 369713 | 369716 | 369720 | 369758 | 369775 | 369859 | 433685