Changeset 266658 in webkit

Timestamp:

Sep 5, 2020, 3:11:24 AM (5 years ago)

Author:

rniwa@webkit.org

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 <​commit-queue@webkit.org> on 2020-09-05

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-05  Commit Queue  <commit-queue@webkit.org>
+
+        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  <twilco.o@protonmail.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -1143 +1143 @@
 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 ]

trunk/LayoutTests/platform/mac/webrtc/captureCanvas-webrtc-software-encoder.html

@@ -42 +42 @@
 
     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);
     });

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-05  Commit Queue  <commit-queue@webkit.org>
+
+        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  <mmaxfield@apple.com>
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -5682 +5682 @@
 {
 #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;