Chromium Code Reviews| 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 20 matching lines...) Expand all Loading... | |
| 32 struct WebURLError; | 32 struct WebURLError; |
| 33 } | 33 } |
| 34 | 34 |
| 35 // This package provides functions used by DumpRenderTree/chromium. | 35 // This package provides functions used by DumpRenderTree/chromium. |
| 36 // DumpRenderTree/chromium uses some code in webkit/ of Chromium. In | 36 // DumpRenderTree/chromium uses some code in webkit/ of Chromium. In |
| 37 // order to minimize the dependency from WebKit to Chromium, the | 37 // order to minimize the dependency from WebKit to Chromium, the |
| 38 // following functions uses WebKit API classes as possible and hide | 38 // following functions uses WebKit API classes as possible and hide |
| 39 // implementation classes. | 39 // implementation classes. |
| 40 namespace webkit_support { | 40 namespace webkit_support { |
| 41 | 41 |
| 42 class TestMediaStreamClient; | |
| 43 | |
| 42 // Initializes or terminates a test environment. | 44 // Initializes or terminates a test environment. |
| 43 // |unit_test_mode| should be set to true when running in a TestSuite, in which | 45 // |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 | 46 // case no AtExitManager is created and ICU is not initialized (as it is already |
| 45 // done by the TestSuite). | 47 // done by the TestSuite). |
| 46 // SetUpTestEnvironment() and SetUpTestEnvironmentForUnitTests() calls | 48 // SetUpTestEnvironment() and SetUpTestEnvironmentForUnitTests() calls |
| 47 // WebKit::initialize(). | 49 // WebKit::initialize(). |
| 48 // TearDownTestEnvironment() calls WebKit::shutdown(). | 50 // TearDownTestEnvironment() calls WebKit::shutdown(). |
| 49 // SetUpTestEnvironmentForUnitTests() should be used when running in a | 51 // SetUpTestEnvironmentForUnitTests() should be used when running in a |
| 50 // TestSuite, in which case no AtExitManager is created and ICU is not | 52 // TestSuite, in which case no AtExitManager is created and ICU is not |
| 51 // initialized (as it is already done by the TestSuite). | 53 // initialized (as it is already done by the TestSuite). |
| 52 void SetUpTestEnvironment(); | 54 void SetUpTestEnvironment(); |
| 53 void SetUpTestEnvironmentForUnitTests(); | 55 void SetUpTestEnvironmentForUnitTests(); |
| 54 void TearDownTestEnvironment(); | 56 void TearDownTestEnvironment(); |
| 55 | 57 |
| 56 // Returns a pointer to a WebKitPlatformSupport implementation for | 58 // Returns a pointer to a WebKitPlatformSupport implementation for |
| 57 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this. | 59 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this. |
| 58 // This returns a pointer to a static instance. Don't delete it. | 60 // This returns a pointer to a static instance. Don't delete it. |
| 59 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport(); | 61 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport(); |
| 60 | 62 |
| 61 // This is used by WebFrameClient::createPlugin(). | 63 // This is used by WebFrameClient::createPlugin(). |
| 62 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame, | 64 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame, |
| 63 const WebKit::WebPluginParams& params); | 65 const WebKit::WebPluginParams& params); |
| 64 | 66 |
| 65 // This is used by WebFrameClient::createMediaPlayer(). | 67 // This is used by WebFrameClient::createMediaPlayer(). |
| 66 WebKit::WebMediaPlayer* CreateMediaPlayer(WebKit::WebFrame* frame, | 68 WebKit::WebMediaPlayer* CreateMediaPlayer( |
| 67 WebKit::WebMediaPlayerClient* client); | 69 WebKit::WebFrame* frame, |
| 70 WebKit::WebMediaPlayerClient* client, | |
| 71 webkit_support::TestMediaStreamClient* test_media_stream_client); | |
|
acolwell GONE FROM CHROMIUM
2012/01/06 18:09:16
Is there any reason why this can't just be MediaSt
wjia(left Chromium)
2012/01/06 22:18:59
changed to MediaStreamClient.
| |
| 72 | |
| 73 // This is used by WebFrameClient::createMediaPlayer(). | |
| 74 WebKit::WebMediaPlayer* CreateMediaPlayer( | |
| 75 WebKit::WebFrame* frame, | |
| 76 WebKit::WebMediaPlayerClient* client); | |
| 68 | 77 |
| 69 // This is used by WebFrameClient::createApplicationCacheHost(). | 78 // This is used by WebFrameClient::createApplicationCacheHost(). |
| 70 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 79 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
| 71 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); | 80 WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); |
| 72 | 81 |
| 73 // Returns the root directory of the WebKit code. | 82 // Returns the root directory of the WebKit code. |
| 74 WebKit::WebString GetWebKitRootDir(); | 83 WebKit::WebString GetWebKitRootDir(); |
| 75 | 84 |
| 76 enum GLBindingPreferences { | 85 enum GLBindingPreferences { |
| 77 GL_BINDING_DEFAULT, | 86 GL_BINDING_DEFAULT, |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 222 | 231 |
| 223 void EnableWebCoreLogChannels(const std::string& channels); | 232 void EnableWebCoreLogChannels(const std::string& channels); |
| 224 | 233 |
| 225 // - Gamepad | 234 // - Gamepad |
| 226 | 235 |
| 227 void SetGamepadData(const WebKit::WebGamepads& pads); | 236 void SetGamepadData(const WebKit::WebGamepads& pads); |
| 228 | 237 |
| 229 } // namespace webkit_support | 238 } // namespace webkit_support |
| 230 | 239 |
| 231 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 240 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
| OLD | NEW |