Title: [116674] trunk
- Revision
- 116674
- Author
- [email protected]
- Date
- 2012-05-10 12:11:17 -0700 (Thu, 10 May 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116673 => 116674)
--- trunk/Source/WebCore/ChangeLog 2012-05-10 19:01:07 UTC (rev 116673)
+++ trunk/Source/WebCore/ChangeLog 2012-05-10 19:11:17 UTC (rev 116674)
@@ -1,3 +1,15 @@
+2012-05-10 Tommy Widenflycht <[email protected]>
+
+ [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 <[email protected]>
Web Inspector: search title is shown beside the search field (not under) in the vertical mode.
Modified: trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp (116673 => 116674)
--- trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2012-05-10 19:01:07 UTC (rev 116673)
+++ trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2012-05-10 19:11:17 UTC (rev 116674)
@@ -88,7 +88,7 @@
void WebMediaStreamDescriptor::setExtraData(ExtraData* extraData)
{
- m_private->setExtraData(new ExtraDataContainer(extraData));
+ m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData)));
}
// FIXME: Cleanup when the chromium code has switched to the split sources implementation.
Modified: trunk/Tools/ChangeLog (116673 => 116674)
--- trunk/Tools/ChangeLog 2012-05-10 19:01:07 UTC (rev 116673)
+++ trunk/Tools/ChangeLog 2012-05-10 19:11:17 UTC (rev 116674)
@@ -1,3 +1,15 @@
+2012-05-10 Tommy Widenflycht <[email protected]>
+
+ [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 <[email protected]>
[chromium] Trigger context menu for long press gesture
Modified: trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp (116673 => 116674)
--- trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-05-10 19:01:07 UTC (rev 116673)
+++ trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-05-10 19:11:17 UTC (rev 116674)
@@ -42,6 +42,11 @@
namespace WebKit {
+class MockExtraData : public WebMediaStreamDescriptor::ExtraData {
+public:
+ int foo;
+};
+
PassOwnPtr<WebUserMediaClientMock> WebUserMediaClientMock::create()
{
return adoptPtr(new WebUserMediaClientMock());
@@ -63,7 +68,12 @@
if (request.video())
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);
}
void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
