| Index: webkit/support/webkit_support.h
|
| ===================================================================
|
| --- webkit/support/webkit_support.h (revision 151527)
|
| +++ webkit/support/webkit_support.h (working copy)
|
| @@ -75,6 +75,8 @@
|
| 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,
|
| @@ -84,8 +86,22 @@
|
| // This is used by WebFrameClient::createMediaPlayer().
|
| WebKit::WebMediaPlayer* CreateMediaPlayer(
|
| WebKit::WebFrame* frame,
|
| + const WebKit::WebURL& url,
|
| + 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,
|
| + const WebKit::WebURL& url,
|
| + WebKit::WebMediaPlayerClient* client);
|
| +
|
| #if defined(OS_ANDROID)
|
| void ReleaseMediaResources();
|
| #endif
|
|
|