Title: [266658] trunk
Revision
266658
Author
[email protected]
Date
2020-09-05 03:11:24 -0700 (Sat, 05 Sep 2020)

Log Message

Unreviewed, reverting r266614 and r266657.
https://bugs.webkit.org/show_bug.cgi?id=216213

Broke builds

Reverted changesets:

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

"Fix the build after r266614"
https://bugs.webkit.org/show_bug.cgi?id=216174
https://trac.webkit.org/changeset/266657

Patch by Commit Queue <[email protected]> on 2020-09-05

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (266657 => 266658)


--- trunk/LayoutTests/ChangeLog	2020-09-05 07:20:02 UTC (rev 266657)
+++ trunk/LayoutTests/ChangeLog	2020-09-05 10:11:24 UTC (rev 266658)
@@ -1,3 +1,20 @@
+2020-09-05  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r266614 and r266657.
+        https://bugs.webkit.org/show_bug.cgi?id=216213
+
+        Broke builds
+
+        Reverted changesets:
+
+        "Fix Internals::supportsVCPEncoder on BigSur"
+        https://bugs.webkit.org/show_bug.cgi?id=216174
+        https://trac.webkit.org/changeset/266614
+
+        "Fix the build after r266614"
+        https://bugs.webkit.org/show_bug.cgi?id=216174
+        https://trac.webkit.org/changeset/266657
+
 2020-09-04  Tyler Wilcock  <[email protected]>
 
         CSS :visited color taken on non-visited link when using CSS variables

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


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

Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (266657 => 266658)


--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2020-09-05 07:20:02 UTC (rev 266657)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2020-09-05 10:11:24 UTC (rev 266658)
@@ -1142,6 +1142,9 @@
 # <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 (266657 => 266658)


--- trunk/Source/WebCore/ChangeLog	2020-09-05 07:20:02 UTC (rev 266657)
+++ trunk/Source/WebCore/ChangeLog	2020-09-05 10:11:24 UTC (rev 266658)
@@ -1,3 +1,20 @@
+2020-09-05  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r266614 and r266657.
+        https://bugs.webkit.org/show_bug.cgi?id=216213
+
+        Broke builds
+
+        Reverted changesets:
+
+        "Fix Internals::supportsVCPEncoder on BigSur"
+        https://bugs.webkit.org/show_bug.cgi?id=216174
+        https://trac.webkit.org/changeset/266614
+
+        "Fix the build after r266614"
+        https://bugs.webkit.org/show_bug.cgi?id=216174
+        https://trac.webkit.org/changeset/266657
+
 2020-09-05  Myles C. Maxfield  <[email protected]>
 
         Fix the build after r266614

Modified: trunk/Source/WebCore/testing/Internals.cpp (266657 => 266658)


--- trunk/Source/WebCore/testing/Internals.cpp	2020-09-05 07:20:02 UTC (rev 266657)
+++ trunk/Source/WebCore/testing/Internals.cpp	2020-09-05 10:11:24 UTC (rev 266658)
@@ -5681,7 +5681,9 @@
 bool Internals::supportsVCPEncoder()
 {
 #if defined(ENABLE_VCP_ENCODER)
-    return ENABLE_VCP_ENCODER || (ENABLE_VCP_VTB_ENCODER) || HAVE_VTB_REQUIREDLOWLATENCY;
+    return ENABLE_VCP_ENCODER || ENABLE_VCP_VTB_ENCODER;
+#elif defined(HAVE_VTB_REQUIREDLOWLATENCY)
+    return true;
 #else
     return false;
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to