Changeset 116674 in webkit

Timestamp:

May 10, 2012 12:11:17 PM (12 years ago)

Author:

tommyw@google.com

Message:

[chromium] MediaStream API: Fix the ExtraData functionality in WebMediaStreamDescriptor
​https://bugs.webkit.org/show_bug.cgi?id=86087

Reviewed by Adam Barth.

Source/WebCore:

Not easy to test but I have added code that excercises this to WebUserMediaClientMock (in DumpRenderTree).

• platform/chromium/support/WebMediaStreamDescriptor.cpp:

(WebKit::WebMediaStreamDescriptor::setExtraData):

Tools:

• DumpRenderTree/chromium/WebUserMediaClientMock.cpp:

(MockExtraData):
(WebKit):
(WebKit::WebUserMediaClientMock::requestUserMedia):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Tommy Widenflycht  <tommyw@google.com>
+
+        [chromium] MediaStream API: Fix the ExtraData functionality in WebMediaStreamDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=86087
+
+        Reviewed by Adam Barth.
+
+        Not easy to test but I have added code that excercises this to WebUserMediaClientMock (in DumpRenderTree).
+
+        * platform/chromium/support/WebMediaStreamDescriptor.cpp:
+        (WebKit::WebMediaStreamDescriptor::setExtraData):
+
 2012-05-10  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp

@@ -89 +89 @@
 void WebMediaStreamDescriptor::setExtraData(ExtraData* extraData)
 {
-    m_private->setExtraData(new ExtraDataContainer(extraData));
+    m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData)));
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-10  Tommy Widenflycht  <tommyw@google.com>
+
+        [chromium] MediaStream API: Fix the ExtraData functionality in WebMediaStreamDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=86087
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/WebUserMediaClientMock.cpp:
+        (MockExtraData):
+        (WebKit):
+        (WebKit::WebUserMediaClientMock::requestUserMedia):
+
 2012-05-10  Varun Jain  <varunjain@google.com>
 

trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp

@@ -43 +43 @@
 namespace WebKit {
 
+class MockExtraData : public WebMediaStreamDescriptor::ExtraData {
+public:
+    int foo;
+};
+
 PassOwnPtr<WebUserMediaClientMock> WebUserMediaClientMock::create()
 {
@@ -64 +69 @@
         videoSources[0].initialize("MockVideoDevice#1", WebMediaStreamSource::TypeVideo, "Mock video device");
 
-    request.requestSucceeded(audioSources, videoSources);
+    WebKit::WebMediaStreamDescriptor descriptor;
+    descriptor.initialize("foobar", audioSources, videoSources);
+
+    descriptor.setExtraData(new MockExtraData());
+
+    request.requestSucceeded(descriptor);
 }