Title: [207933] trunk/Source/WebCore
- Revision
- 207933
- Author
- m...@apple.com
- Date
- 2016-10-26 21:54:14 -0700 (Wed, 26 Oct 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207932 => 207933)
--- trunk/Source/WebCore/ChangeLog 2016-10-27 03:42:13 UTC (rev 207932)
+++ trunk/Source/WebCore/ChangeLog 2016-10-27 04:54:14 UTC (rev 207933)
@@ -1,3 +1,13 @@
+2016-10-26 Dan Bernstein <m...@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....@gmail.com>
[DOMJIT] Implement Node::ownerDocument
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (207932 => 207933)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2016-10-27 03:42:13 UTC (rev 207932)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2016-10-27 04:54:14 UTC (rev 207933)
@@ -99,6 +99,11 @@
return m_scriptExecutionContext->topOrigin();
}
+Document* UserMediaRequest::document() const
+{
+ return downcast<Document>(scriptExecutionContext());
+}
+
void UserMediaRequest::start()
{
if (m_controller)
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (207932 => 207933)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2016-10-27 03:42:13 UTC (rev 207932)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2016-10-27 04:54:14 UTC (rev 207933)
@@ -79,7 +79,7 @@
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&&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
