OLD | NEW |
1 // Copyright (c) 2011 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" |
11 #include "base/string16.h" | 11 #include "base/string16.h" |
(...skipping 13 matching lines...) Expand all Loading... |
25 class WebPlugin; | 25 class WebPlugin; |
26 class WebString; | 26 class WebString; |
27 class WebThemeEngine; | 27 class WebThemeEngine; |
28 class WebURL; | 28 class WebURL; |
29 class WebURLRequest; | 29 class WebURLRequest; |
30 class WebURLResponse; | 30 class WebURLResponse; |
31 struct WebPluginParams; | 31 struct WebPluginParams; |
32 struct WebURLError; | 32 struct WebURLError; |
33 } | 33 } |
34 | 34 |
| 35 namespace webkit_media { |
| 36 class MediaStreamClient; |
| 37 } |
| 38 |
35 // This package provides functions used by DumpRenderTree/chromium. | 39 // This package provides functions used by DumpRenderTree/chromium. |
36 // DumpRenderTree/chromium uses some code in webkit/ of Chromium. In | 40 // DumpRenderTree/chromium uses some code in webkit/ of Chromium. In |
37 // order to minimize the dependency from WebKit to Chromium, the | 41 // order to minimize the dependency from WebKit to Chromium, the |
38 // following functions uses WebKit API classes as possible and hide | 42 // following functions uses WebKit API classes as possible and hide |
39 // implementation classes. | 43 // implementation classes. |
40 namespace webkit_support { | 44 namespace webkit_support { |
41 | 45 |
42 // Initializes or terminates a test environment. | 46 // Initializes or terminates a test environment. |
43 // |unit_test_mode| should be set to true when running in a TestSuite, in which | 47 // |unit_test_mode| should be set to true when running in a TestSuite, in which |
44 // case no AtExitManager is created and ICU is not initialized (as it is already | 48 // case no AtExitManager is created and ICU is not initialized (as it is already |
(...skipping 11 matching lines...) Expand all Loading... |
56 // Returns a pointer to a WebKitPlatformSupport implementation for | 60 // Returns a pointer to a WebKitPlatformSupport implementation for |
57 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this. | 61 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this. |
58 // This returns a pointer to a static instance. Don't delete it. | 62 // This returns a pointer to a static instance. Don't delete it. |
59 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport(); | 63 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport(); |
60 | 64 |
61 // This is used by WebFrameClient::createPlugin(). | 65 // This is used by WebFrameClient::createPlugin(). |
62 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame, | 66 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame, |
63 const WebKit::WebPluginParams& params); | 67 const WebKit::WebPluginParams& params); |
64 | 68 |
65 // This is used by WebFrameClient::createMediaPlayer(). | 69 // This is used by WebFrameClient::createMediaPlayer(). |
66 WebKit::WebMediaPlayer* CreateMediaPlayer(WebKit::WebFrame* frame, | 70 WebKit::WebMediaPlayer* CreateMediaPlayer( |
67 WebKit::WebMediaPlayerClient* client); | 71 WebKit::WebFrame* frame, |
| 72 WebKit::WebMediaPlayerClient* client, |
| 73 webkit_media::MediaStreamClient* media_stream_client); |
| 74 |
| 75 // This is used by WebFrameClient::createMediaPlayer(). |
| 76 WebKit::WebMediaPlayer* CreateMediaPlayer( |
| 77 WebKit::WebFrame* frame, |
| 78 WebKit::WebMediaPlayerClient* client); |
68 | 79 |
69 // This is used by WebFrameClient::createApplicationCacheHost(). | 80 // This is used by WebFrameClient::createApplicationCacheHost(). |
70 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 81 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
71 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); | 82 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); |
72 | 83 |
73 // Returns the root directory of the WebKit code. | 84 // Returns the root directory of the WebKit code. |
74 WebKit::WebString GetWebKitRootDir(); | 85 WebKit::WebString GetWebKitRootDir(); |
75 | 86 |
76 enum GLBindingPreferences { | 87 enum GLBindingPreferences { |
77 GL_BINDING_DEFAULT, | 88 GL_BINDING_DEFAULT, |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 | 233 |
223 void EnableWebCoreLogChannels(const std::string& channels); | 234 void EnableWebCoreLogChannels(const std::string& channels); |
224 | 235 |
225 // - Gamepad | 236 // - Gamepad |
226 | 237 |
227 void SetGamepadData(const WebKit::WebGamepads& pads); | 238 void SetGamepadData(const WebKit::WebGamepads& pads); |
228 | 239 |
229 } // namespace webkit_support | 240 } // namespace webkit_support |
230 | 241 |
231 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 242 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
OLD | NEW |