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. | |
scherkus (not reviewing)
2012/08/15 22:53:57
ditto
wjia(left Chromium)
2012/08/15 23:14:35
Done.
| |
78 // This is used by WebFrameClient::createMediaPlayer(). | 79 // This is used by WebFrameClient::createMediaPlayer(). |
79 WebKit::WebMediaPlayer* CreateMediaPlayer( | 80 WebKit::WebMediaPlayer* CreateMediaPlayer( |
80 WebKit::WebFrame* frame, | 81 WebKit::WebFrame* frame, |
81 WebKit::WebMediaPlayerClient* client, | 82 WebKit::WebMediaPlayerClient* client, |
82 webkit_media::MediaStreamClient* media_stream_client); | 83 webkit_media::MediaStreamClient* media_stream_client); |
83 | 84 |
84 // This is used by WebFrameClient::createMediaPlayer(). | 85 // This is used by WebFrameClient::createMediaPlayer(). |
85 WebKit::WebMediaPlayer* CreateMediaPlayer( | 86 WebKit::WebMediaPlayer* CreateMediaPlayer( |
86 WebKit::WebFrame* frame, | 87 WebKit::WebFrame* frame, |
88 const WebKit::WebURL& url, | |
89 WebKit::WebMediaPlayerClient* client, | |
90 webkit_media::MediaStreamClient* media_stream_client); | |
91 | |
92 // TODO(wjia): remove this function after WebKit patch is landed. | |
93 // This is used by WebFrameClient::createMediaPlayer(). | |
94 WebKit::WebMediaPlayer* CreateMediaPlayer( | |
95 WebKit::WebFrame* frame, | |
87 WebKit::WebMediaPlayerClient* client); | 96 WebKit::WebMediaPlayerClient* client); |
88 | 97 |
98 // This is used by WebFrameClient::createMediaPlayer(). | |
99 WebKit::WebMediaPlayer* CreateMediaPlayer( | |
100 WebKit::WebFrame* frame, | |
101 const WebKit::WebURL& url, | |
102 WebKit::WebMediaPlayerClient* client); | |
103 | |
89 #if defined(OS_ANDROID) | 104 #if defined(OS_ANDROID) |
90 void ReleaseMediaResources(); | 105 void ReleaseMediaResources(); |
91 #endif | 106 #endif |
92 | 107 |
93 // This is used by WebFrameClient::createApplicationCacheHost(). | 108 // This is used by WebFrameClient::createApplicationCacheHost(). |
94 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 109 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
95 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); | 110 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); |
96 | 111 |
97 // This is used by WebViewHost::createSessionStorageNamespace(). | 112 // This is used by WebViewHost::createSessionStorageNamespace(). |
98 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota); | 113 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota); |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
269 | 284 |
270 void EnableWebCoreLogChannels(const std::string& channels); | 285 void EnableWebCoreLogChannels(const std::string& channels); |
271 | 286 |
272 // - Gamepad | 287 // - Gamepad |
273 | 288 |
274 void SetGamepadData(const WebKit::WebGamepads& pads); | 289 void SetGamepadData(const WebKit::WebGamepads& pads); |
275 | 290 |
276 } // namespace webkit_support | 291 } // namespace webkit_support |
277 | 292 |
278 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 293 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
OLD | NEW |