Attachment 371116 Details for Bug 198457 – Patch

[patch] Patch

bug-198457-20190601113050.patch (text/plain), 3.67 KB, created by Devin Rousso on 2019-06-01 11:30:51 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-01 11:30:51 PDT

Size: 3.67 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b258c5f1e81b1816d2352e9ec20a12d430b87628..51b2599573942578dc4bb9606a5598f15e194fd5 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-06-01  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Canvas: in tests don't manually stop recording if a frame count is specified
>+        https://bugs.webkit.org/show_bug.cgi?id=198457
>+        <rdar://problem/48248697>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        If a `frameCount` is specified, the recording will stop by itself, so if we hit the
>+        `LastFrame`, there's no need to manually stop the recording at that point. Otherwise,
>+        stopping it early may cause the recording to think that the last frame is incomplete.
>+
>+        * inspector/canvas/resources/recording-utilities.js:
>+        * inspector/canvas/recording-webgl-snapshots.html:
>+        * inspector/canvas/recording-webgl2-snapshots.html:
>+
> 2019-05-31  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Make tests that use UIHelper more robust under certain configurations
>diff --git a/LayoutTests/inspector/canvas/recording-webgl-snapshots.html b/LayoutTests/inspector/canvas/recording-webgl-snapshots.html
>index 3b5f33e6d12c63eeea6b17b2d5cf82e50a708a8a..b70c7c59ee6a0b03f5ac19ef8c01b1f6568016b9 100644
>--- a/LayoutTests/inspector/canvas/recording-webgl-snapshots.html
>+++ b/LayoutTests/inspector/canvas/recording-webgl-snapshots.html
>@@ -100,7 +100,7 @@ function test() {
>         name: "Canvas.recordingWebGL.snapshots",
>         description: "Check that the snapshot taken after each visual action is different.",
>         test(resolve, reject) {
>-            startRecording(WI.Canvas.ContextType.WebGL, resolve, reject, {checkForContentChange: true});
>+            startRecording(WI.Canvas.ContextType.WebGL, resolve, reject, {frameCount: 1, checkForContentChange: true});
>         },
>         timeout: -1,
>     });
>diff --git a/LayoutTests/inspector/canvas/recording-webgl2-snapshots.html b/LayoutTests/inspector/canvas/recording-webgl2-snapshots.html
>index 0190520660fe0be2e10990cd9f9974e702378224..82f27c9d64f7da328655921ee30888939f6cb59e 100644
>--- a/LayoutTests/inspector/canvas/recording-webgl2-snapshots.html
>+++ b/LayoutTests/inspector/canvas/recording-webgl2-snapshots.html
>@@ -102,7 +102,7 @@ function test() {
>         name: "Canvas.recordingWebGL2.snapshots",
>         description: "Check that the snapshot taken after each visual action is different.",
>         test(resolve, reject) {
>-            startRecording(WI.Canvas.ContextType.WebGL2, resolve, reject, {checkForContentChange: true});
>+            startRecording(WI.Canvas.ContextType.WebGL2, resolve, reject, {frameCount: 1, checkForContentChange: true});
>         },
>         timeout: -1,
>     });
>diff --git a/LayoutTests/inspector/canvas/resources/recording-utilities.js b/LayoutTests/inspector/canvas/resources/recording-utilities.js
>index 8b99563d3270ac32cfc80d2984f5c38696c5beb4..60146ff38487fd193e23d33747df31046cc681f3 100644
>--- a/LayoutTests/inspector/canvas/resources/recording-utilities.js
>+++ b/LayoutTests/inspector/canvas/resources/recording-utilities.js
>@@ -107,9 +107,10 @@ TestPage.registerInitializer(() => {
>         .then((event) => {
>             lastFrame = true;
> 
>-            if (canvas.recordingActive)
>-                CanvasAgent.stopRecording(canvas.identifier).catch(reject);
>-            else {
>+            if (canvas.recordingActive) {
>+                if (!frameCount)
>+                    CanvasAgent.stopRecording(canvas.identifier).catch(reject);
>+            } else {
>                 InspectorTest.evaluateInPage(`cancelActions()`)
>                 .then(() => {
>                     if (swizzled)

Actions: View | Formatted Diff | Diff

Attachments on bug 198457: 371116