OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 5 #ifndef WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
6 #define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 6 #define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 | 68 |
69 // Returns a pointer to a WebKitPlatformSupport implementation for | 69 // Returns a pointer to a WebKitPlatformSupport implementation for |
70 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this. | 70 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this. |
71 // This returns a pointer to a static instance. Don't delete it. | 71 // This returns a pointer to a static instance. Don't delete it. |
72 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport(); | 72 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport(); |
73 | 73 |
74 // This is used by WebFrameClient::createPlugin(). | 74 // This is used by WebFrameClient::createPlugin(). |
75 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame, | 75 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame, |
76 const WebKit::WebPluginParams& params); | 76 const WebKit::WebPluginParams& params); |
77 | 77 |
| 78 // TODO(wjia): remove this function after WebKit patch is landed. |
| 79 // http://webk.it/91301. |
78 // This is used by WebFrameClient::createMediaPlayer(). | 80 // This is used by WebFrameClient::createMediaPlayer(). |
79 WebKit::WebMediaPlayer* CreateMediaPlayer( | 81 WebKit::WebMediaPlayer* CreateMediaPlayer( |
80 WebKit::WebFrame* frame, | 82 WebKit::WebFrame* frame, |
81 WebKit::WebMediaPlayerClient* client, | 83 WebKit::WebMediaPlayerClient* client, |
82 webkit_media::MediaStreamClient* media_stream_client); | 84 webkit_media::MediaStreamClient* media_stream_client); |
83 | 85 |
84 // This is used by WebFrameClient::createMediaPlayer(). | 86 // This is used by WebFrameClient::createMediaPlayer(). |
85 WebKit::WebMediaPlayer* CreateMediaPlayer( | 87 WebKit::WebMediaPlayer* CreateMediaPlayer( |
86 WebKit::WebFrame* frame, | 88 WebKit::WebFrame* frame, |
| 89 const WebKit::WebURL& url, |
| 90 WebKit::WebMediaPlayerClient* client, |
| 91 webkit_media::MediaStreamClient* media_stream_client); |
| 92 |
| 93 // TODO(wjia): remove this function after WebKit patch is landed. |
| 94 // This is used by WebFrameClient::createMediaPlayer(). |
| 95 WebKit::WebMediaPlayer* CreateMediaPlayer( |
| 96 WebKit::WebFrame* frame, |
87 WebKit::WebMediaPlayerClient* client); | 97 WebKit::WebMediaPlayerClient* client); |
88 | 98 |
| 99 // This is used by WebFrameClient::createMediaPlayer(). |
| 100 WebKit::WebMediaPlayer* CreateMediaPlayer( |
| 101 WebKit::WebFrame* frame, |
| 102 const WebKit::WebURL& url, |
| 103 WebKit::WebMediaPlayerClient* client); |
| 104 |
89 #if defined(OS_ANDROID) | 105 #if defined(OS_ANDROID) |
90 void ReleaseMediaResources(); | 106 void ReleaseMediaResources(); |
91 #endif | 107 #endif |
92 | 108 |
93 // This is used by WebFrameClient::createApplicationCacheHost(). | 109 // This is used by WebFrameClient::createApplicationCacheHost(). |
94 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 110 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
95 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); | 111 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); |
96 | 112 |
97 // This is used by WebViewHost::createSessionStorageNamespace(). | 113 // This is used by WebViewHost::createSessionStorageNamespace(). |
98 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota); | 114 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota); |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 | 285 |
270 void EnableWebCoreLogChannels(const std::string& channels); | 286 void EnableWebCoreLogChannels(const std::string& channels); |
271 | 287 |
272 // - Gamepad | 288 // - Gamepad |
273 | 289 |
274 void SetGamepadData(const WebKit::WebGamepads& pads); | 290 void SetGamepadData(const WebKit::WebGamepads& pads); |
275 | 291 |
276 } // namespace webkit_support | 292 } // namespace webkit_support |
277 | 293 |
278 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 294 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
OLD | NEW |