Title: [266701] trunk
Revision
266701
Author
[email protected]
Date
2020-09-07 09:11:56 -0700 (Mon, 07 Sep 2020)

Log Message

Fix Internals::supportsVCPEncoder on BigSur
https://bugs.webkit.org/show_bug.cgi?id=216174

Reviewed by Eric Carlson.

Source/WebCore:

Fixed by unflaked test.

* testing/Internals.cpp:
(WebCore::Internals::supportsVCPEncoder):
All MacOS supported versions now supports VCP.

LayoutTests:

* platform/mac-wk2/TestExpectations:
* platform/mac/webrtc/captureCanvas-webrtc-software-encoder-expected.txt:
* platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html:
Slight modification to make the test run faster and output more comprehensive error message if error happens.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (266700 => 266701)


--- trunk/LayoutTests/ChangeLog	2020-09-07 16:11:10 UTC (rev 266700)
+++ trunk/LayoutTests/ChangeLog	2020-09-07 16:11:56 UTC (rev 266701)
@@ -1,5 +1,17 @@
 2020-09-07  Youenn Fablet  <[email protected]>
 
+        Fix Internals::supportsVCPEncoder on BigSur
+        https://bugs.webkit.org/show_bug.cgi?id=216174
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac-wk2/TestExpectations:
+        * platform/mac/webrtc/captureCanvas-webrtc-software-encoder-expected.txt:
+        * platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html:
+        Slight modification to make the test run faster and output more comprehensive error message if error happens.
+
+2020-09-07  Youenn Fablet  <[email protected]>
+
         Safari takes too long to fetch images from memory cache
         https://bugs.webkit.org/show_bug.cgi?id=216048
         <rdar://problem/68260952>

Modified: trunk/LayoutTests/platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html (266700 => 266701)


--- trunk/LayoutTests/platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html	2020-09-07 16:11:10 UTC (rev 266700)
+++ trunk/LayoutTests/platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html	2020-09-07 16:11:56 UTC (rev 266701)
@@ -41,9 +41,9 @@
         return;
 
     if (count === 40)
-        return Promise.reject(testName + " failed");
+        return Promise.reject(testName + " failed: tried " + count + " to get " + isSame + " but got " + isEqual);
 
-    return waitFor(100).then(() => {
+    return waitFor(50).then(() => {
         return testCanvas(testName, canvas, isSame, ++count);
     });
 }

Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (266700 => 266701)


--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2020-09-07 16:11:10 UTC (rev 266700)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2020-09-07 16:11:56 UTC (rev 266701)
@@ -1142,9 +1142,6 @@
 # <rdar://problem/63626512> REGRESSION(20A279-20A291a): webrtc/simulcast-h264.html is a constant timeout
 webrtc/simulcast-h264.html [ Pass Timeout ]
 
-# <rdar://problem/66492801> [ Mac wk2 ] platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html is timing out
-platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html [ Pass Failure Timeout ]
-
 # <rdar://problem/60642539> [ macOS wk2 ] inspector/unit-tests/async-test-suite.html is flaky timing out
 [ Catalina ] inspector/unit-tests/async-test-suite.html [ Slow ]
 

Modified: trunk/Source/WebCore/ChangeLog (266700 => 266701)


--- trunk/Source/WebCore/ChangeLog	2020-09-07 16:11:10 UTC (rev 266700)
+++ trunk/Source/WebCore/ChangeLog	2020-09-07 16:11:56 UTC (rev 266701)
@@ -1,5 +1,18 @@
 2020-09-07  Youenn Fablet  <[email protected]>
 
+        Fix Internals::supportsVCPEncoder on BigSur
+        https://bugs.webkit.org/show_bug.cgi?id=216174
+
+        Reviewed by Eric Carlson.
+
+        Fixed by unflaked test.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::supportsVCPEncoder):
+        All MacOS supported versions now supports VCP.
+
+2020-09-07  Youenn Fablet  <[email protected]>
+
         Update IDLAttributes.json to forbid Exposed on dictionary
         https://bugs.webkit.org/show_bug.cgi?id=216243
 

Modified: trunk/Source/WebCore/testing/Internals.cpp (266700 => 266701)


--- trunk/Source/WebCore/testing/Internals.cpp	2020-09-07 16:11:10 UTC (rev 266700)
+++ trunk/Source/WebCore/testing/Internals.cpp	2020-09-07 16:11:56 UTC (rev 266701)
@@ -332,10 +332,6 @@
 #include <wtf/spi/darwin/SandboxSPI.h>
 #endif
 
-#if PLATFORM(MAC) && USE(LIBWEBRTC)
-#include <webrtc/sdk/WebKit/VideoProcessingSoftLink.h>
-#endif
-
 using JSC::CallData;
 using JSC::CodeBlock;
 using JSC::FunctionExecutable;
@@ -5680,9 +5676,7 @@
 
 bool Internals::supportsVCPEncoder()
 {
-#if defined(ENABLE_VCP_ENCODER)
-    return ENABLE_VCP_ENCODER || ENABLE_VCP_VTB_ENCODER;
-#elif defined(HAVE_VTB_REQUIREDLOWLATENCY)
+#if PLATFORM(COCOA)
     return true;
 #else
     return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to