Changeset 129145 in webkit

Timestamp:

Sep 20, 2012 11:23:13 AM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Extend UserMediaRequest with a ownerDocument method
​https://bugs.webkit.org/show_bug.cgi?id=97095

Reviewed by Adam Barth.

Source/WebCore:

Chromium need to know exactly which frame called getUserMedia so that it can
clean away the stream when the frame goes away.
Since that information is available in webkit add an accessor method.

Chromium mock class extended to test the added method.

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::ownerDocument):
(WebCore):

• Modules/mediastream/UserMediaRequest.h:

(WebCore):
(UserMediaRequest):

Source/WebKit/chromium:

Chromium need to know exactly which frame called getUserMedia so that it can clean
away the stream when the frame goes away.
Since that information is available in webkit add an accessor method.

Also taking the opportunity to remove an unused deprecated method,
and adding asserts in case the object is empty.

• public/WebUserMediaRequest.h:

(WebKit):
(WebUserMediaRequest):

• src/WebUserMediaRequest.cpp:

(WebKit::WebUserMediaRequest::ownerDocument):

Tools:

Extending WebUserMediaClientMock to check that the owning document is valid,
and that the document has a frame.

• DumpRenderTree/chromium/WebUserMediaClientMock.cpp:

(WebKit::WebUserMediaClientMock::requestUserMedia):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/UserMediaRequest.h (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebUserMediaRequest.h (modified) (2 diffs)
• Source/WebKit/chromium/src/WebUserMediaRequest.cpp (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-20  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Extend UserMediaRequest with a ownerDocument method
+        https://bugs.webkit.org/show_bug.cgi?id=97095
+
+        Reviewed by Adam Barth.
+
+        Chromium need to know exactly which frame called getUserMedia so that it can
+        clean away the stream when the frame goes away.
+        Since that information is available in webkit add an accessor method.
+
+        Chromium mock class extended to test the added method.
+
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::ownerDocument):
+        (WebCore):
+        * Modules/mediastream/UserMediaRequest.h:
+        (WebCore):
+        (UserMediaRequest):
+
 2012-09-20  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

@@ -37 +37 @@
 
 #include "Dictionary.h"
+#include "Document.h"
 #include "LocalMediaStream.h"
 #include "MediaStreamCenter.h"
@@ -68 +69 @@
 UserMediaRequest::~UserMediaRequest()
 {
+}
+
+Document* UserMediaRequest::ownerDocument()
+{
+    if (m_scriptExecutionContext) {
+        ASSERT(m_scriptExecutionContext->isDocument());
+        return static_cast<Document*>(m_scriptExecutionContext);
+    }
+
+    return 0;
 }
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h

@@ -46 +46 @@
 
 class Dictionary;
+class Document;
 class MediaStreamDescriptor;
 class UserMediaController;
@@ -56 +57 @@
     NavigatorUserMediaSuccessCallback* successCallback() const { return m_successCallback.get(); }
     NavigatorUserMediaErrorCallback* errorCallback() const { return m_errorCallback.get(); }
+    Document* ownerDocument();
 
     void start();

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-20  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Extend UserMediaRequest with a ownerDocument method
+        https://bugs.webkit.org/show_bug.cgi?id=97095
+
+        Reviewed by Adam Barth.
+
+        Chromium need to know exactly which frame called getUserMedia so that it can clean
+        away the stream when the frame goes away.
+        Since that information is available in webkit add an accessor method.
+
+        Also taking the opportunity to remove an unused deprecated method,
+        and adding asserts in case the object is empty.
+
+        * public/WebUserMediaRequest.h:
+        (WebKit):
+        (WebUserMediaRequest):
+        * src/WebUserMediaRequest.cpp:
+        (WebKit::WebUserMediaRequest::ownerDocument):
+
 2012-09-20  Mike West  <mkwst@google.com>
 

trunk/Source/WebKit/chromium/public/WebUserMediaRequest.h

@@ -41 +41 @@
 
 namespace WebKit {
-
+class WebDocument;
 class WebMediaStreamDescriptor;
 class WebMediaStreamSource;
@@ -68 +68 @@
 
     WEBKIT_EXPORT WebSecurityOrigin securityOrigin() const;
-
-    // DEPRECATED
-    WEBKIT_EXPORT void requestSucceeded(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
+    WEBKIT_EXPORT WebDocument ownerDocument() const;
 
     WEBKIT_EXPORT void requestSucceeded(const WebMediaStreamDescriptor&);

trunk/Source/WebKit/chromium/src/WebUserMediaRequest.cpp

@@ -36 +36 @@
 
 #include "Document.h"
-#include "Frame.h"
 #include "MediaStreamDescriptor.h"
 #include "MediaStreamSource.h"
-#include "Page.h"
 #include "SecurityOrigin.h"
 #include "UserMediaRequest.h"
+#include "WebDocument.h"
 #include "WebSecurityOrigin.h"
 #include "platform/WebMediaStreamDescriptor.h"
@@ -65 +64 @@
 bool WebUserMediaRequest::audio() const
 {
+    ASSERT(!isNull());
     return m_private->audio();
 }
@@ -70 +70 @@
 bool WebUserMediaRequest::video() const
 {
+    ASSERT(!isNull());
     return m_private->video();
 }
@@ -75 +76 @@
 WebSecurityOrigin WebUserMediaRequest::securityOrigin() const
 {
-    ASSERT(m_private->scriptExecutionContext());
+    ASSERT(!isNull() && m_private->scriptExecutionContext());
     return WebSecurityOrigin(m_private->scriptExecutionContext()->securityOrigin());
 }
 
-void WebUserMediaRequest::requestSucceeded(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources)
+WebDocument WebUserMediaRequest::ownerDocument() const
 {
-    if (m_private.isNull())
-        return;
-
-    MediaStreamSourceVector audio;
-    for (size_t i = 0; i < audioSources.size(); ++i) {
-        MediaStreamSource* curr = audioSources[i];
-        audio.append(curr);
-    }
-    MediaStreamSourceVector video;
-    for (size_t i = 0; i < videoSources.size(); ++i) {
-        MediaStreamSource* curr = videoSources[i];
-        video.append(curr);
-    }
-
-    m_private->succeed(audio, video);
+    ASSERT(!isNull());
+    return WebDocument(m_private->ownerDocument());
 }
 
 void WebUserMediaRequest::requestSucceeded(const WebMediaStreamDescriptor& streamDescriptor)
 {
-    ASSERT(!streamDescriptor.isNull());
-    if (m_private.isNull())
-        return;
-
+    ASSERT(!isNull() && !streamDescriptor.isNull());
     m_private->succeed(streamDescriptor);
 }
@@ -109 +94 @@
 void WebUserMediaRequest::requestFailed()
 {
+    ASSERT(!isNull());
     m_private->fail();
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-20  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Extend UserMediaRequest with a ownerDocument method
+        https://bugs.webkit.org/show_bug.cgi?id=97095
+
+        Reviewed by Adam Barth.
+
+        Extending WebUserMediaClientMock to check that the owning document is valid,
+        and that the document has a frame.
+
+        * DumpRenderTree/chromium/WebUserMediaClientMock.cpp:
+        (WebKit::WebUserMediaClientMock::requestUserMedia):
+
 2012-09-20  Stephen Chenney  <schenney@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp

@@ -34 +34 @@
 #include "WebUserMediaClientMock.h"
 
+#include "WebDocument.h"
 #include "WebMediaStreamRegistry.h"
 #include "WebUserMediaRequest.h"
@@ -57 +58 @@
     ASSERT(!streamRequest.isNull());
     WebUserMediaRequest request = streamRequest;
+
+    if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
+        request.requestFailed();
+        return;
+    }
 
     const size_t zero = 0;