summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 21:11:53 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 21:11:53 +0000
commitd6b1a4697903a5eef7dd603a176d9d1ed39256ed (patch)
treed999b5f2a3fc748a38e6e0c9d08f702faf73c3af /webkit/support
parent937a94d46325b88635582cd0cd96498b453387bf (diff)
downloadchromium_src-d6b1a4697903a5eef7dd603a176d9d1ed39256ed.zip
chromium_src-d6b1a4697903a5eef7dd603a176d9d1ed39256ed.tar.gz
chromium_src-d6b1a4697903a5eef7dd603a176d9d1ed39256ed.tar.bz2
remove old createMediaPlayer which doesn't have URL as argument.
Since WebKit patch has been landed (WebKit r126463), createMediaPlayer without URL as argument is not needed any more. BUG=142988 Review URL: https://chromiumcodereview.appspot.com/10873064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.cc13
-rw-r--r--webkit/support/webkit_support.h14
2 files changed, 0 insertions, 27 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 290567f..6b8c4e3 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -386,13 +386,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
const WebURL& url,
WebMediaPlayerClient* client,
webkit_media::MediaStreamClient* media_stream_client) {
- return CreateMediaPlayer(frame, client, media_stream_client);
-}
-
-WebKit::WebMediaPlayer* CreateMediaPlayer(
- WebFrame* frame,
- WebMediaPlayerClient* client,
- webkit_media::MediaStreamClient* media_stream_client) {
#if defined(OS_ANDROID)
return new webkit_media::WebMediaPlayerAndroid(
frame,
@@ -422,12 +415,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
WebKit::WebMediaPlayer* CreateMediaPlayer(
WebFrame* frame,
- WebMediaPlayerClient* client) {
- return CreateMediaPlayer(frame, client, NULL);
-}
-
-WebKit::WebMediaPlayer* CreateMediaPlayer(
- WebFrame* frame,
const WebURL& url,
WebMediaPlayerClient* client) {
return CreateMediaPlayer(frame, url, client, NULL);
diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h
index 7d86119..18244e2 100644
--- a/webkit/support/webkit_support.h
+++ b/webkit/support/webkit_support.h
@@ -75,14 +75,6 @@ WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport();
WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame,
const WebKit::WebPluginParams& params);
-// TODO(wjia): remove this function after WebKit patch is landed.
-// http://webk.it/91301.
-// This is used by WebFrameClient::createMediaPlayer().
-WebKit::WebMediaPlayer* CreateMediaPlayer(
- WebKit::WebFrame* frame,
- WebKit::WebMediaPlayerClient* client,
- webkit_media::MediaStreamClient* media_stream_client);
-
// This is used by WebFrameClient::createMediaPlayer().
WebKit::WebMediaPlayer* CreateMediaPlayer(
WebKit::WebFrame* frame,
@@ -90,12 +82,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
WebKit::WebMediaPlayerClient* client,
webkit_media::MediaStreamClient* media_stream_client);
-// TODO(wjia): remove this function after WebKit patch is landed.
-// This is used by WebFrameClient::createMediaPlayer().
-WebKit::WebMediaPlayer* CreateMediaPlayer(
- WebKit::WebFrame* frame,
- WebKit::WebMediaPlayerClient* client);
-
// This is used by WebFrameClient::createMediaPlayer().
WebKit::WebMediaPlayer* CreateMediaPlayer(
WebKit::WebFrame* frame,