Changeset 252854 in webkit

Timestamp:

Nov 25, 2019 5:03:24 AM (4 years ago)

Author:

youenn@apple.com

Message:

Enable legacy getUserMedia as a quirk
​https://bugs.webkit.org/show_bug.cgi?id=204403
<rdar://problem/56421276>

Reviewed by Eric Carlson.

Add a shim for legacy getUserMedia to cover uses of this legacy API for existing web pages.
Add a corresponding settings and quirk.
Covered by manual test.

• Modules/mediastream/NavigatorMediaDevices.idl:
• bindings/js/JSDOMBindingInternals.js:
• bindings/js/JSNavigatorCustom.cpp:

(WebCore::JSNavigator::getUserMedia):

• dom/Document.cpp:

(WebCore::m_undoManager):

• page/Quirks.cpp:

(WebCore::Quirks::shouldEnableLegacyGetUserMedia const):

• page/Quirks.h:
• page/Settings.yaml:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/NavigatorMediaDevices.idl (modified) (1 diff)
• bindings/js/JSDOMBindingInternals.js (modified) (1 diff)
• bindings/js/JSNavigatorCustom.cpp (modified) (2 diffs)
• dom/Document.cpp (modified) (1 diff)
• page/Quirks.cpp (modified) (1 diff)
• page/Quirks.h (modified) (1 diff)
• page/Settings.yaml (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-25  Youenn Fablet  <youenn@apple.com>
+
+        Enable legacy getUserMedia as a quirk
+        https://bugs.webkit.org/show_bug.cgi?id=204403
+        <rdar://problem/56421276>
+
+        Reviewed by Eric Carlson.
+
+        Add a shim for legacy getUserMedia to cover uses of this legacy API for existing web pages.
+        Add a corresponding settings and quirk.
+        Covered by manual test.
+
+        * Modules/mediastream/NavigatorMediaDevices.idl:
+        * bindings/js/JSDOMBindingInternals.js:
+        * bindings/js/JSNavigatorCustom.cpp:
+        (WebCore::JSNavigator::getUserMedia):
+        * dom/Document.cpp:
+        (WebCore::m_undoManager):
+        * page/Quirks.cpp:
+        (WebCore::Quirks::shouldEnableLegacyGetUserMedia const):
+        * page/Quirks.h:
+        * page/Settings.yaml:
+
 2019-11-25  Charlie Turner  <cturner@igalia.com>
 

trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.idl

@@ -34 +34 @@
 ] partial interface Navigator {
     [SameObject, SecureContext, ContextAllowsMediaDevices] readonly attribute MediaDevices mediaDevices;
+    [Custom, EnabledBySetting=LegacyGetUserMedia] void getUserMedia(object constraints, object? successCallback, object? errorCallback);
 };

trunk/Source/WebCore/bindings/js/JSDOMBindingInternals.js

@@ -33 +33 @@
     });
 }
+
+function getUserMediaShim(constraints, successCallback, errorCallback)
+{
+    this.mediaDevices.getUserMedia(constraints).then(successCallback, errorCallback);
+}

trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp

@@ -27 +27 @@
 #include "JSNavigator.h"
 
+#include "WebCoreJSClientData.h"
+#include <JavaScriptCore/CatchScope.h>
+
 namespace WebCore {
 
@@ -34 +37 @@
 }
 
+#if ENABLE(MEDIA_STREAM)
+JSValue JSNavigator::getUserMedia(JSGlobalObject& lexicalGlobalObject, CallFrame& callFrame)
+{
+    auto* function = globalObject()->builtinInternalFunctions().jsDOMBindingInternals().m_getUserMediaShimFunction.get();
+    ASSERT(function);
+
+    JSC::CallData callData;
+    JSC::CallType callType = JSC::getCallData(lexicalGlobalObject.vm(), function, callData);
+    ASSERT(callType != JSC::CallType::None);
+    JSC::MarkedArgumentBuffer arguments;
+    for (size_t cptr = 0; cptr < callFrame.argumentCount(); ++cptr)
+        arguments.append(callFrame.uncheckedArgument(cptr));
+    ASSERT(!arguments.hasOverflowed());
+    JSC::call(&lexicalGlobalObject, function, callType, callData, this, arguments);
+    return jsUndefined();
 }
+#endif
+
+}

trunk/Source/WebCore/dom/Document.cpp

@@ -608 +608 @@
 
     InspectorInstrumentation::addEventListenersToNode(*this);
+#if ENABLE(MEDIA_STREAM)
+    m_settings->setLegacyGetUserMediaEnabled(quirks().shouldEnableLegacyGetUserMedia());
+#endif
 }
 

trunk/Source/WebCore/page/Quirks.cpp

@@ -630 +630 @@
 }
 
-}
+#if ENABLE(MEDIA_STREAM)
+bool Quirks::shouldEnableLegacyGetUserMedia() const
+{
+    if (!needsQuirks())
+        return false;
+
+    return m_document->url().protocolIs("https") && equalLettersIgnoringASCIICase(m_document-> url().host(), "www.baidu.com");
+}
+#endif
+
+}

trunk/Source/WebCore/page/Quirks.h

@@ -85 +85 @@
     bool shouldBypassBackForwardCache() const;
 
+#if ENABLE(MEDIA_STREAM)
+    bool shouldEnableLegacyGetUserMedia() const;
+#endif
+
 private:
     bool needsQuirks() const;

trunk/Source/WebCore/page/Settings.yaml

@@ -890 +890 @@
   initial: false
 
+legacyGetUserMediaEnabled:
+  initial: false
+  conditional: MEDIA_STREAM
+
 # Deprecated