Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: webkit/support/webkit_support.h

Issue 12385074: Remove WebCompositorSupport::initialize/shutdown dependency from webkit_support::CreateLayerTreeView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test_webkit_platform_support Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/support/test_webkit_platform_support.cc ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 IN_PROCESS_COMMAND_BUFFER 126 IN_PROCESS_COMMAND_BUFFER
127 }; 127 };
128 // Registers which GraphicsContext3D Implementation to use. 128 // Registers which GraphicsContext3D Implementation to use.
129 void SetGraphicsContext3DImplementation(GraphicsContext3DImplementation); 129 void SetGraphicsContext3DImplementation(GraphicsContext3DImplementation);
130 GraphicsContext3DImplementation GetGraphicsContext3DImplementation(); 130 GraphicsContext3DImplementation GetGraphicsContext3DImplementation();
131 131
132 WebKit::WebGraphicsContext3D* CreateGraphicsContext3D( 132 WebKit::WebGraphicsContext3D* CreateGraphicsContext3D(
133 const WebKit::WebGraphicsContext3D::Attributes& attributes, 133 const WebKit::WebGraphicsContext3D::Attributes& attributes,
134 WebKit::WebView* web_view); 134 WebKit::WebView* web_view);
135 135
136 enum LayerTreeViewType {
137 FAKE_CONTEXT,
138 SOFTWARE_CONTEXT,
139 MESA_CONTEXT
140 };
141
136 class DRTLayerTreeViewClient { 142 class DRTLayerTreeViewClient {
137 public: 143 public:
138 virtual ~DRTLayerTreeViewClient() { } 144 virtual ~DRTLayerTreeViewClient() { }
139 virtual void Layout() = 0; 145 virtual void Layout() = 0;
140 virtual void ScheduleComposite() = 0; 146 virtual void ScheduleComposite() = 0;
141 }; 147 };
142 148
149 WebKit::WebLayerTreeView* CreateLayerTreeView(
150 LayerTreeViewType type,
151 DRTLayerTreeViewClient* client,
152 WebKit::WebThread* thread);
153
154 // DEPRECATED. TODO(jamesr): Remove these two after fixing WebKit-side callers.
143 WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware( 155 WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware(
144 DRTLayerTreeViewClient* client); 156 DRTLayerTreeViewClient* client);
145 WebKit::WebLayerTreeView* CreateLayerTreeView3d( 157 WebKit::WebLayerTreeView* CreateLayerTreeView3d(
146 DRTLayerTreeViewClient* client); 158 DRTLayerTreeViewClient* client);
147 159
148 // ------- URL load mocking. 160 // ------- URL load mocking.
149 // Registers the file at |file_path| to be served when |url| is requested. 161 // Registers the file at |file_path| to be served when |url| is requested.
150 // |response| is the response provided with the contents. 162 // |response| is the response provided with the contents.
151 void RegisterMockedURL(const WebKit::WebURL& url, 163 void RegisterMockedURL(const WebKit::WebURL& url,
152 const WebKit::WebURLResponse& response, 164 const WebKit::WebURLResponse& response,
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 314
303 void EnableWebCoreLogChannels(const std::string& channels); 315 void EnableWebCoreLogChannels(const std::string& channels);
304 316
305 // - Gamepad 317 // - Gamepad
306 318
307 void SetGamepadData(const WebKit::WebGamepads& pads); 319 void SetGamepadData(const WebKit::WebGamepads& pads);
308 320
309 } // namespace webkit_support 321 } // namespace webkit_support
310 322
311 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ 323 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
OLDNEW
« no previous file with comments | « webkit/support/test_webkit_platform_support.cc ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698