| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 LayerTreeViewType type, | 150 LayerTreeViewType type, |
| 151 DRTLayerTreeViewClient* client, | 151 DRTLayerTreeViewClient* client, |
| 152 WebKit::WebThread* thread); | 152 WebKit::WebThread* thread); |
| 153 | 153 |
| 154 // DEPRECATED. TODO(jamesr): Remove these two after fixing WebKit-side callers. | 154 // DEPRECATED. TODO(jamesr): Remove these two after fixing WebKit-side callers. |
| 155 WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware( | 155 WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware( |
| 156 DRTLayerTreeViewClient* client); | 156 DRTLayerTreeViewClient* client); |
| 157 WebKit::WebLayerTreeView* CreateLayerTreeView3d( | 157 WebKit::WebLayerTreeView* CreateLayerTreeView3d( |
| 158 DRTLayerTreeViewClient* client); | 158 DRTLayerTreeViewClient* client); |
| 159 | 159 |
| 160 #define WEBKIT_SUPPORT_HAS_SET_THREADING_COMPOSITING_ENABLED 1 |
| 161 void SetThreadedCompositorEnabled(bool enabled); |
| 162 |
| 160 // ------- URL load mocking. | 163 // ------- URL load mocking. |
| 161 // Registers the file at |file_path| to be served when |url| is requested. | 164 // Registers the file at |file_path| to be served when |url| is requested. |
| 162 // |response| is the response provided with the contents. | 165 // |response| is the response provided with the contents. |
| 163 void RegisterMockedURL(const WebKit::WebURL& url, | 166 void RegisterMockedURL(const WebKit::WebURL& url, |
| 164 const WebKit::WebURLResponse& response, | 167 const WebKit::WebURLResponse& response, |
| 165 const WebKit::WebString& file_path); | 168 const WebKit::WebString& file_path); |
| 166 | 169 |
| 167 // Registers the error to be returned when |url| is requested. | 170 // Registers the error to be returned when |url| is requested. |
| 168 void RegisterMockedErrorURL(const WebKit::WebURL& url, | 171 void RegisterMockedErrorURL(const WebKit::WebURL& url, |
| 169 const WebKit::WebURLResponse& response, | 172 const WebKit::WebURLResponse& response, |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 | 317 |
| 315 void EnableWebCoreLogChannels(const std::string& channels); | 318 void EnableWebCoreLogChannels(const std::string& channels); |
| 316 | 319 |
| 317 // - Gamepad | 320 // - Gamepad |
| 318 | 321 |
| 319 void SetGamepadData(const WebKit::WebGamepads& pads); | 322 void SetGamepadData(const WebKit::WebGamepads& pads); |
| 320 | 323 |
| 321 } // namespace webkit_support | 324 } // namespace webkit_support |
| 322 | 325 |
| 323 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 326 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ |
| OLD | NEW |