| 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. | |
| 80 // This is used by WebFrameClient::createMediaPlayer(). | |
| 81 WebKit::WebMediaPlayer* CreateMediaPlayer( | |
| 82 WebKit::WebFrame* frame, | |
| 83 WebKit::WebMediaPlayerClient* client, | |
| 84 webkit_media::MediaStreamClient* media_stream_client); | |
| 85 | |
| 86 // This is used by WebFrameClient::createMediaPlayer(). | 78 // This is used by WebFrameClient::createMediaPlayer(). |
| 87 WebKit::WebMediaPlayer* CreateMediaPlayer( | 79 WebKit::WebMediaPlayer* CreateMediaPlayer( |
| 88 WebKit::WebFrame* frame, | 80 WebKit::WebFrame* frame, |
| 89 const WebKit::WebURL& url, | 81 const WebKit::WebURL& url, |
| 90 WebKit::WebMediaPlayerClient* client, | 82 WebKit::WebMediaPlayerClient* client, |
| 91 webkit_media::MediaStreamClient* media_stream_client); | 83 webkit_media::MediaStreamClient* media_stream_client); |
| 92 | 84 |
| 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, | |
| 97 WebKit::WebMediaPlayerClient* client); | |
| 98 | |
| 99 // This is used by WebFrameClient::createMediaPlayer(). | 85 // This is used by WebFrameClient::createMediaPlayer(). |
| 100 WebKit::WebMediaPlayer* CreateMediaPlayer( | 86 WebKit::WebMediaPlayer* CreateMediaPlayer( |
| 101 WebKit::WebFrame* frame, | 87 WebKit::WebFrame* frame, |
| 102 const WebKit::WebURL& url, | 88 const WebKit::WebURL& url, |
| 103 WebKit::WebMediaPlayerClient* client); | 89 WebKit::WebMediaPlayerClient* client); |
| 104 | 90 |
| 105 #if defined(OS_ANDROID) | 91 #if defined(OS_ANDROID) |
| 106 void ReleaseMediaResources(); | 92 void ReleaseMediaResources(); |
| 107 #endif | 93 #endif |
| 108 | 94 |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 | 277 |
| 292 void EnableWebCoreLogChannels(const std::string& channels); | 278 void EnableWebCoreLogChannels(const std::string& channels); |
| 293 | 279 |
| 294 // - Gamepad | 280 // - Gamepad |
| 295 | 281 |
| 296 void SetGamepadData(const WebKit::WebGamepads& pads); | 282 void SetGamepadData(const WebKit::WebGamepads& pads); |
| 297 | 283 |
| 298 } // namespace webkit_support | 284 } // namespace webkit_support |
| 299 | 285 |
| 300 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 286 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
| OLD | NEW |