Fixed the WebKit2 build.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Oct 2016 04:54:14 +0000 (04:54 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Oct 2016 04:54:14 +0000 (04:54 +0000)
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::document): Moved the definition of this function to here from…
* Modules/mediastream/UserMediaRequest.h:
(WebCore::UserMediaRequest::document): …here, so that the WebKit2 build doesn’t encounter an
  exported inline function.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@207933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
Source/WebCore/Modules/mediastream/UserMediaRequest.h

index 4e2f70d..13cab1a 100644 (file)
@@ -1,3 +1,13 @@
+2016-10-26  Dan Bernstein  <mitz@apple.com>
+
+        Fixed the WebKit2 build.
+
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::document): Moved the definition of this function to here from…
+        * Modules/mediastream/UserMediaRequest.h:
+        (WebCore::UserMediaRequest::document): …here, so that the WebKit2 build doesn’t encounter an
+          exported inline function.
+
 2016-10-26  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [DOMJIT] Implement Node::ownerDocument
index b02c326..5063d46 100644 (file)
@@ -99,6 +99,11 @@ SecurityOrigin* UserMediaRequest::topLevelDocumentOrigin() const
     return m_scriptExecutionContext->topOrigin();
 }
 
+Document* UserMediaRequest::document() const
+{
+    return downcast<Document>(scriptExecutionContext());
+}
+
 void UserMediaRequest::start()
 {
     if (m_controller)
index 5a99d5a..439904f 100644 (file)
@@ -79,7 +79,7 @@ public:
 
     WEBCORE_EXPORT SecurityOrigin* userMediaDocumentOrigin() const;
     WEBCORE_EXPORT SecurityOrigin* topLevelDocumentOrigin() const;
-    WEBCORE_EXPORT Document* document() const { return downcast<Document>(scriptExecutionContext()); }
+    WEBCORE_EXPORT Document* document() const;
 
 private:
     UserMediaRequest(ScriptExecutionContext*, UserMediaController*, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, MediaDevices::Promise&&);