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

Side by Side Diff: webkit/compositor_bindings/web_layer_tree_view_impl.cc

Issue 11348371: cc: Move WebCompositorOutputSurface and related classes into cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forlanding6 Created 8 years 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #include "web_layer_tree_view_impl.h" 5 #include "web_layer_tree_view_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "cc/font_atlas.h" 8 #include "cc/font_atlas.h"
9 #include "cc/input_handler.h" 9 #include "cc/input_handler.h"
10 #include "cc/layer.h" 10 #include "cc/layer.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 void WebLayerTreeViewImpl::layout() 229 void WebLayerTreeViewImpl::layout()
230 { 230 {
231 m_client->layout(); 231 m_client->layout();
232 } 232 }
233 233
234 void WebLayerTreeViewImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale) 234 void WebLayerTreeViewImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale)
235 { 235 {
236 m_client->applyScrollAndScale(scrollDelta, pageScale); 236 m_client->applyScrollAndScale(scrollDelta, pageScale);
237 } 237 }
238 238
239 scoped_ptr<WebCompositorOutputSurface> WebLayerTreeViewImpl::createOutputSurface () 239 scoped_ptr<cc::OutputSurface> WebLayerTreeViewImpl::createOutputSurface()
240 { 240 {
241 return scoped_ptr<WebCompositorOutputSurface>(m_client->createOutputSurface( )); 241 WebKit::WebCompositorOutputSurface* web = m_client->createOutputSurface();
242 return make_scoped_ptr(static_cast<cc::OutputSurface*>(web));
242 } 243 }
243 244
244 void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success) 245 void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success)
245 { 246 {
246 m_client->didRecreateOutputSurface(success); 247 m_client->didRecreateOutputSurface(success);
247 } 248 }
248 249
249 scoped_ptr<InputHandler> WebLayerTreeViewImpl::createInputHandler() 250 scoped_ptr<InputHandler> WebLayerTreeViewImpl::createInputHandler()
250 { 251 {
251 scoped_ptr<InputHandler> ret; 252 scoped_ptr<InputHandler> ret;
(...skipping 22 matching lines...) Expand all
274 { 275 {
275 m_client->didCompleteSwapBuffers(); 276 m_client->didCompleteSwapBuffers();
276 } 277 }
277 278
278 void WebLayerTreeViewImpl::scheduleComposite() 279 void WebLayerTreeViewImpl::scheduleComposite()
279 { 280 {
280 m_client->scheduleComposite(); 281 m_client->scheduleComposite();
281 } 282 }
282 283
283 } // namespace WebKit 284 } // namespace WebKit
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/web_layer_tree_view_impl.h ('k') | webkit/compositor_bindings/web_layer_tree_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698