Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (114713 => 114714)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-20 03:29:35 UTC (rev 114714)
@@ -1,3 +1,24 @@
+2012-04-19 Jeremy Mao <[email protected]>
+
+ Media Stream API: Piece of code cleanup for the chromium port
+ https://bugs.webkit.org/show_bug.cgi?id=84328
+
+ Reviewed by Kent Tamura.
+
+ Remove some deprecated interfaces.
+
+ No new tests. No behavior changes.
+
+ * public/WebUserMediaClient.h:
+ Remove deprecated requestUserMedia interface.
+ * public/WebUserMediaRequest.h:
+ Remove deprecated requestSucceeded interface.
+ * src/UserMediaClientImpl.cpp:
+ (WebKit::UserMediaClientImpl::requestUserMedia):
+ Use the requestUserMedia split sources implementation.
+ * src/WebUserMediaRequest.cpp:
+ Remove deprecated requestSucceeded implementation.
+
2012-04-19 Joshua Bell <[email protected]>
[Chromium] IndexedDB: Prep for changing keyPath return type
Modified: trunk/Source/WebKit/chromium/public/WebUserMediaClient.h (114713 => 114714)
--- trunk/Source/WebKit/chromium/public/WebUserMediaClient.h 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Source/WebKit/chromium/public/WebUserMediaClient.h 2012-04-20 03:29:35 UTC (rev 114714)
@@ -41,9 +41,6 @@
public:
virtual ~WebUserMediaClient() { }
- // DEPRECATED
- virtual void requestUserMedia(const WebUserMediaRequest&, const WebVector<WebMediaStreamSource>&) { }
-
virtual void requestUserMedia(const WebUserMediaRequest&, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources) { }
virtual void cancelUserMediaRequest(const WebUserMediaRequest&) = 0;
Modified: trunk/Source/WebKit/chromium/public/WebUserMediaRequest.h (114713 => 114714)
--- trunk/Source/WebKit/chromium/public/WebUserMediaRequest.h 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Source/WebKit/chromium/public/WebUserMediaRequest.h 2012-04-20 03:29:35 UTC (rev 114714)
@@ -68,9 +68,6 @@
WEBKIT_EXPORT bool cameraPreferenceEnvironment() const;
WEBKIT_EXPORT WebSecurityOrigin securityOrigin() const;
- // DEPRECATED
- WEBKIT_EXPORT void requestSucceeded(const WebVector<WebMediaStreamSource>&);
-
WEBKIT_EXPORT void requestSucceeded(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
WEBKIT_EXPORT void requestFailed();
Modified: trunk/Source/WebKit/chromium/src/UserMediaClientImpl.cpp (114713 => 114714)
--- trunk/Source/WebKit/chromium/src/UserMediaClientImpl.cpp 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Source/WebKit/chromium/src/UserMediaClientImpl.cpp 2012-04-20 03:29:35 UTC (rev 114714)
@@ -58,12 +58,6 @@
if (m_client) {
RefPtr<UserMediaRequest> request = prpRequest;
- // FIXME: Cleanup when the chromium code has switched to the split sources implementation.
- MediaStreamSourceVector combinedSources;
- combinedSources.append(audioSources);
- combinedSources.append(videoSources);
- m_client->requestUserMedia(PassRefPtr<UserMediaRequest>(request.get()), combinedSources);
-
m_client->requestUserMedia(request.release(), audioSources, videoSources);
}
}
Modified: trunk/Source/WebKit/chromium/src/WebUserMediaRequest.cpp (114713 => 114714)
--- trunk/Source/WebKit/chromium/src/WebUserMediaRequest.cpp 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Source/WebKit/chromium/src/WebUserMediaRequest.cpp 2012-04-20 03:29:35 UTC (rev 114714)
@@ -105,24 +105,6 @@
m_private->succeed(audio, video);
}
-// FIXME: Cleanup when the chromium code has switched to the split sources implementation.
-void WebUserMediaRequest::requestSucceeded(const WebVector<WebMediaStreamSource>& sources)
-{
- if (m_private.isNull())
- return;
-
- MediaStreamSourceVector audio, video;
- for (size_t i = 0; i < sources.size(); ++i) {
- MediaStreamSource* curr = sources[i];
- if (curr->type() == MediaStreamSource::TypeAudio)
- audio.append(curr);
- else if (curr->type() == MediaStreamSource::TypeVideo)
- video.append(curr);
- }
-
- m_private->succeed(audio, video);
-}
-
void WebUserMediaRequest::requestFailed()
{
m_private->fail();
Modified: trunk/Tools/ChangeLog (114713 => 114714)
--- trunk/Tools/ChangeLog 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Tools/ChangeLog 2012-04-20 03:29:35 UTC (rev 114714)
@@ -1,3 +1,19 @@
+2012-04-19 Jeremy Mao <[email protected]>
+
+ Media Stream API: Piece of code cleanup for the chromium port
+ https://bugs.webkit.org/show_bug.cgi?id=84328
+
+ Reviewed by Kent Tamura.
+
+ WebUserMediaClientMock use an old requestUserMedia interface and
+ Replace it with the new interface.
+
+ * DumpRenderTree/chromium/WebUserMediaClientMock.cpp:
+ (WebKit::WebUserMediaClientMock::requestUserMedia):
+ Remove the old requestUserMedia and replace it with the new.
+ * DumpRenderTree/chromium/WebUserMediaClientMock.h:
+ (WebUserMediaClientMock):
+
2012-04-19 Christophe Dumez <[email protected]>
[EFL] DRT console messages should contain only the file name part of local URIs
Modified: trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp (114713 => 114714)
--- trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-04-20 03:29:35 UTC (rev 114714)
@@ -65,17 +65,20 @@
return trackId.equals("mediastreamtest");
}
-void WebUserMediaClientMock::requestUserMedia(const WebUserMediaRequest& streamRequest, const WebVector<WebMediaStreamSource>& streamSourceVector)
+void WebUserMediaClientMock::requestUserMedia(const WebUserMediaRequest& streamRequest, const WebVector<WebMediaStreamSource>& audioSourcesVector, const WebVector<WebMediaStreamSource>& videoSourcesVector)
{
ASSERT(!streamRequest.isNull());
WebUserMediaRequest request = streamRequest;
const size_t size = 1;
- WebVector<WebMediaStreamSource> sourceVector(size);
+ WebVector<WebMediaStreamSource> audioSources(size);
+ WebVector<WebMediaStreamSource> videoSources(size);
WebString trackId("mediastreamtest");
- WebString trackName("VideoCapture");
- sourceVector[0].initialize(trackId, WebMediaStreamSource::TypeVideo, trackName);
- request.requestSucceeded(sourceVector);
+ WebString audioTrackName("AudioRecord");
+ WebString videoTrackName("VideoCapture");
+ audioSources[0].initialize(trackId, WebMediaStreamSource::TypeAudio, audioTrackName);
+ videoSources[0].initialize(trackId, WebMediaStreamSource::TypeVideo, videoTrackName);
+ request.requestSucceeded(audioSources, videoSources);
}
void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&)
Modified: trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h (114713 => 114714)
--- trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h 2012-04-20 02:32:34 UTC (rev 114713)
+++ trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h 2012-04-20 03:29:35 UTC (rev 114714)
@@ -50,7 +50,7 @@
bool IsMockStream(const WebURL&);
- virtual void requestUserMedia(const WebUserMediaRequest&, const WebVector<WebMediaStreamSource>&);
+ virtual void requestUserMedia(const WebUserMediaRequest&, const WebVector<WebMediaStreamSource>&, const WebVector<WebMediaStreamSource>&) OVERRIDE;
virtual void cancelUserMediaRequest(const WebUserMediaRequest&);
private:
