Attachment 350156 Details for Bug 172879 – Patch

[patch] Patch

bug-172879-20180919155820.patch (text/plain), 4.67 KB, created by youenn fablet on 2018-09-19 15:58:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-09-19 15:58:20 PDT

Size: 4.67 KB

patch

obsolete

>Subversion Revision: 236212
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 05c0aa26b1cf941c9cdf0cd92c78587492c70492..78ccfde706de4af38f902d7c920adc4e5b1febf0 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-09-19  Youenn Fablet  <youenn@apple.com>
>+
>+        LayoutTest webrtc/video-unmute.html is a flaky timeout
>+        https://bugs.webkit.org/show_bug.cgi?id=172879
>+        <rdar://problem/32548738>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios-wk2/TestExpectations:
>+        * platform/mac-wk2/TestExpectations:
>+        * webrtc/video-unmute.html:
>+        Resort on routines.js black frame routine.
>+        Reenable test in mac and ios.
>+
> 2018-09-19  Youenn Fablet  <youenn@apple.com>
> 
>         Layout Test webrtc/video-mute.html is flaky.
>diff --git a/LayoutTests/platform/ios-wk2/TestExpectations b/LayoutTests/platform/ios-wk2/TestExpectations
>index 9c0b1ca179864d45f2a7f9251b0a63e112d85521..044d47411745308a5e99771ad1cbe9625659113d 100644
>--- a/LayoutTests/platform/ios-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-wk2/TestExpectations
>@@ -1245,8 +1245,6 @@ webkit.org/b/181167 imported/w3c/web-platform-tests/service-workers/service-work
> 
> webkit.org/b/181392 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html [ Pass Failure ]
> 
>-webkit.org/b/172879 webrtc/video-unmute.html [ Skip ]
>-
> webkit.org/b/181957 [ Release ] http/tests/misc/resource-timing-resolution.html [ Pass Failure ]
> 
> webkit.org/b/181821 fast/visual-viewport/ios/caret-after-focus-in-fixed.html [ Pass Failure ]
>diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
>index cf048f4b75d6c7deb73be695e71cb512c67b072e..bd6f3590a4dc78f78051571ac62b20f40723c716 100644
>--- a/LayoutTests/platform/mac-wk2/TestExpectations
>+++ b/LayoutTests/platform/mac-wk2/TestExpectations
>@@ -795,8 +795,6 @@ webkit.org/b/181167 imported/w3c/web-platform-tests/service-workers/service-work
> 
> webkit.org/b/181107 http/wpt/cache-storage/cache-put-stream.https.any.html [ Pass Failure ]
> 
>-webkit.org/b/172879 webrtc/video-unmute.html [ Skip ]
>-
> webkit.org/b/181502 swipe/pushstate-with-manual-scrollrestoration.html [ Failure ]
> 
> webkit.org/b/181750 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html [ DumpJSConsoleLogInStdErr Pass Failure ]
>diff --git a/LayoutTests/webrtc/video-unmute.html b/LayoutTests/webrtc/video-unmute.html
>index 015ac29d00a76b3b94eac1ca912d04aa67ca2c17..5f91585129c53bdc76a2376aee220a3c9c59444e 100644
>--- a/LayoutTests/webrtc/video-unmute.html
>+++ b/LayoutTests/webrtc/video-unmute.html
>@@ -11,49 +11,8 @@
>         <video id="video" autoplay playsInline width="320" height="240"></video>
>         <canvas id="canvas1" width="320" height="240"></canvas>
>         <canvas id="canvas2" width="320" height="240"></canvas>
>-        <canvas id="canvas3" width="320" height="240"></canvas>
>         <script src ="routines.js"></script>
>         <script>
>-function isVideoBlack(id)
>-{
>-    var canvas = document.getElementById(id);
>-    canvas.width = video.videoWidth;
>-    canvas.height = video.videoHeight;
>-    canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
>-
>-    imageData = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
>-    data = imageData.data;
>-    for (var cptr = 0; cptr < canvas.width * canvas.height; ++cptr) {
>-        // Approximatively black pixels.
>-        if (data[4 * cptr] > 10 || data[4 * cptr + 1] > 10 || data[4 * cptr + 2] > 10)
>-            return false;
>-    }
>-    return true;
>-}
>-
>-function pollVideoBlackCheck(expected, id, resolve, reject, counter)
>-{
>-    if (isVideoBlack(id) === expected) {
>-        resolve();
>-        return;
>-    }
>-
>-    if (!counter)
>-        counter = 0;
>-    else if (++counter > 40) {
>-        reject("test for " + id + " timed out");
>-        return;
>-    }
>-    setTimeout(() => pollVideoBlackCheck(expected, id, resolve, reject, counter), 100);
>-}
>-
>-function checkVideoBlack(expected, id)
>-{
>-    return new Promise((resolve, reject) => {
>-        pollVideoBlackCheck(expected, id, resolve, reject);
>-    });
>-}
>-
> var track;
> var remoteTrack;
> promise_test((test) => {
>@@ -82,12 +41,12 @@ promise_test((test) => {
> }, "Setting video exchange");
> 
> promise_test((test) => {
>-    return checkVideoBlack(true, "canvas1");
>+    return checkVideoBlack(true, canvas1, video);
> }, "Track is disabled, video should be black");
> 
> promise_test((test) => {
>     track.enabled = true;
>-    return checkVideoBlack(false, "canvas2");
>+    return checkVideoBlack(false, canvas2, video);
> }, "Track is enabled, video should not be black");
> 
>         </script>

Actions: View | Formatted Diff | Diff

Attachments on bug 172879: 350156