Changeset 246015 in webkit

Timestamp:

Jun 1, 2019, 1:19:18 PM (7 years ago)

Author:

Devin Rousso

Message:

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 Joseph Pecoraro.

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:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/canvas/recording-webgl-snapshots.html (modified) (1 diff)
• inspector/canvas/recording-webgl2-snapshots.html (modified) (1 diff)
• inspector/canvas/resources/recording-utilities.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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 Joseph Pecoraro.
+
+        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>
 

trunk/LayoutTests/inspector/canvas/recording-webgl-snapshots.html

@@ -101 +101 @@
         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,

trunk/LayoutTests/inspector/canvas/recording-webgl2-snapshots.html

@@ -103 +103 @@
         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,

trunk/LayoutTests/inspector/canvas/resources/recording-utilities.js

@@ -108 +108 @@
             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(() => {