Improved the last build fix.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Oct 2016 06:01:57 +0000 (06:01 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Oct 2016 06:01:57 +0000 (06:01 +0000)
Darin pointed out I could have kept the function inline and just removed the WEBCORE_EXPORT.

* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::document): Deleted.
* Modules/mediastream/UserMediaRequest.h:
(WebCore::UserMediaRequest::document):

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

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

index 2a22603..34a81cc 100644 (file)
@@ -1,3 +1,14 @@
+2016-10-26  Dan Bernstein  <mitz@apple.com>
+
+        Improved the last build fix.
+
+        Darin pointed out I could have kept the function inline and just removed the WEBCORE_EXPORT.
+
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::document): Deleted.
+        * Modules/mediastream/UserMediaRequest.h:
+        (WebCore::UserMediaRequest::document):
+
 2016-10-26  Chris Dumez  <cdumez@apple.com>
 
         [Web IDL] Add support for having string enumerations in their own IDL file
index 5063d46..b02c326 100644 (file)
@@ -99,11 +99,6 @@ SecurityOrigin* UserMediaRequest::topLevelDocumentOrigin() const
     return m_scriptExecutionContext->topOrigin();
 }
 
-Document* UserMediaRequest::document() const
-{
-    return downcast<Document>(scriptExecutionContext());
-}
-
 void UserMediaRequest::start()
 {
     if (m_controller)
index 439904f..8dc6a1e 100644 (file)
@@ -79,7 +79,7 @@ public:
 
     WEBCORE_EXPORT SecurityOrigin* userMediaDocumentOrigin() const;
     WEBCORE_EXPORT SecurityOrigin* topLevelDocumentOrigin() const;
-    WEBCORE_EXPORT Document* document() const;
+    Document* document() const { return downcast<Document>(scriptExecutionContext()); }
 
 private:
     UserMediaRequest(ScriptExecutionContext*, UserMediaController*, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, MediaDevices::Promise&&);