- Revision
- 126463
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-23 12:01:04 -0700 (Thu, 23 Aug 2012)
Log Message
create different WebKit::WebMediaPlayer based on URL
https://bugs.webkit.org/show_bug.cgi?id=91301
Patch by Wei Jia <w...@chromium.org> on 2012-08-23
Reviewed by Adam Barth.
Source/WebKit/chromium:
Pass URL to WebFrameClient::createMediaPlayer(). This allows creation
of different WebMediaPlayer implementations based on the URL.
* public/WebFrameClient.h:
(WebKit::WebFrameClient::createMediaPlayer): add URL as additional argument.
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::createWebMediaPlayer): add URL as additional argument.
(WebKit::WebMediaPlayerClientImpl::loadInternal):
Tools:
Pass URL to createMediaPlayer. This corresponds to change in base
class WebKit::WebFrameClient.
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::createMediaPlayer): add URL as additional argument.
* DumpRenderTree/chromium/WebViewHost.h:
(WebViewHost):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (126462 => 126463)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-23 19:00:14 UTC (rev 126462)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-23 19:01:04 UTC (rev 126463)
@@ -1,3 +1,19 @@
+2012-08-23 Wei Jia <w...@chromium.org>
+
+ create different WebKit::WebMediaPlayer based on URL
+ https://bugs.webkit.org/show_bug.cgi?id=91301
+
+ Reviewed by Adam Barth.
+
+ Pass URL to WebFrameClient::createMediaPlayer(). This allows creation
+ of different WebMediaPlayer implementations based on the URL.
+
+ * public/WebFrameClient.h:
+ (WebKit::WebFrameClient::createMediaPlayer): add URL as additional argument.
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::createWebMediaPlayer): add URL as additional argument.
+ (WebKit::WebMediaPlayerClientImpl::loadInternal):
+
2012-08-23 Joshua Bell <jsb...@chromium.org>
IndexedDB: Move onSuccess(IDBDatabaseBackendInterface) to IDBOpenDBRequest
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (126462 => 126463)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2012-08-23 19:00:14 UTC (rev 126462)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2012-08-23 19:01:04 UTC (rev 126463)
@@ -88,7 +88,7 @@
virtual WebSharedWorker* createSharedWorker(WebFrame*, const WebURL&, const WebString&, unsigned long long) { return 0; }
// May return null.
- virtual WebMediaPlayer* createMediaPlayer(WebFrame*, WebMediaPlayerClient*) { return 0; }
+ virtual WebMediaPlayer* createMediaPlayer(WebFrame*, const WebURL&, WebMediaPlayerClient*) { return 0; }
// May return null.
virtual WebApplicationCacheHost* createApplicationCacheHost(WebFrame*, WebApplicationCacheHostClient*) { return 0; }
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (126462 => 126463)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-08-23 19:00:14 UTC (rev 126462)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-08-23 19:01:04 UTC (rev 126463)
@@ -45,13 +45,13 @@
namespace WebKit {
-static PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(WebMediaPlayerClient* client, Frame* frame)
+static PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(WebMediaPlayerClient* client, const WebURL& url, Frame* frame)
{
WebFrameImpl* webFrame = WebFrameImpl::fromFrame(frame);
if (!webFrame->client())
return nullptr;
- return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, client));
+ return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, url, client));
}
bool WebMediaPlayerClientImpl::m_isEnabled = false;
@@ -321,7 +321,7 @@
#endif
Frame* frame = static_cast<HTMLMediaElement*>(m_mediaPlayer->mediaPlayerClient())->document()->frame();
- m_webMediaPlayer = createWebMediaPlayer(this, frame);
+ m_webMediaPlayer = createWebMediaPlayer(this, KURL(ParsedURLString, m_url), frame);
if (m_webMediaPlayer) {
#if ENABLE(WEB_AUDIO)
// Make sure if we create/re-create the WebMediaPlayer that we update our wrapper.
Modified: trunk/Tools/ChangeLog (126462 => 126463)
--- trunk/Tools/ChangeLog 2012-08-23 19:00:14 UTC (rev 126462)
+++ trunk/Tools/ChangeLog 2012-08-23 19:01:04 UTC (rev 126463)
@@ -1,3 +1,18 @@
+2012-08-23 Wei Jia <w...@chromium.org>
+
+ create different WebKit::WebMediaPlayer based on URL
+ https://bugs.webkit.org/show_bug.cgi?id=91301
+
+ Reviewed by Adam Barth.
+
+ Pass URL to createMediaPlayer. This corresponds to change in base
+ class WebKit::WebFrameClient.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::createMediaPlayer): add URL as additional argument.
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2012-08-23 Gyuyoung Kim <gyuyoung....@samsung.com>
Unreviewed, upgrade gyuyoung to reviewer.
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (126462 => 126463)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-08-23 19:00:14 UTC (rev 126462)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-08-23 19:01:04 UTC (rev 126463)
@@ -1006,12 +1006,12 @@
return webkit_support::CreateWebPlugin(frame, params);
}
-WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, WebMediaPlayerClient* client)
+WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client)
{
#if ENABLE(MEDIA_STREAM)
- return webkit_support::CreateMediaPlayer(frame, client, testMediaStreamClient());
+ return webkit_support::CreateMediaPlayer(frame, url, client, testMediaStreamClient());
#else
- return webkit_support::CreateMediaPlayer(frame, client);
+ return webkit_support::CreateMediaPlayer(frame, url, client);
#endif
}
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (126462 => 126463)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-08-23 19:00:14 UTC (rev 126462)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-08-23 19:01:04 UTC (rev 126463)
@@ -225,7 +225,7 @@
// WebKit::WebFrameClient
virtual WebKit::WebPlugin* createPlugin(WebKit::WebFrame*, const WebKit::WebPluginParams&);
- virtual WebKit::WebMediaPlayer* createMediaPlayer(WebKit::WebFrame*, WebKit::WebMediaPlayerClient*);
+ virtual WebKit::WebMediaPlayer* createMediaPlayer(WebKit::WebFrame*, const WebKit::WebURL&, WebKit::WebMediaPlayerClient*);
virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(WebKit::WebFrame*, WebKit::WebApplicationCacheHostClient*);
virtual void loadURLExternally(WebKit::WebFrame*, const WebKit::WebURLRequest&, WebKit::WebNavigationPolicy);
virtual void loadURLExternally(WebKit::WebFrame*, const WebKit::WebURLRequest&, WebKit::WebNavigationPolicy, const WebKit::WebString& downloadName);
