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

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

Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-unittests Created 8 years, 1 month 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/compositor_bindings/web_compositor_support_impl.cc ('k') | webkit/glue/webpreferences.h » ('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 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 "cc/font_atlas.h" 7 #include "cc/font_atlas.h"
8 #include "cc/input_handler.h" 8 #include "cc/input_handler.h"
9 #include "cc/layer.h" 9 #include "cc/layer.h"
10 #include "cc/layer_tree_host.h" 10 #include "cc/layer_tree_host.h"
(...skipping 21 matching lines...) Expand all
32 { 32 {
33 } 33 }
34 34
35 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti ngs, scoped_ptr<Thread> implThread) 35 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti ngs, scoped_ptr<Thread> implThread)
36 { 36 {
37 LayerTreeSettings settings; 37 LayerTreeSettings settings;
38 settings.acceleratePainting = webSettings.acceleratePainting; 38 settings.acceleratePainting = webSettings.acceleratePainting;
39 settings.showPlatformLayerTree = webSettings.showPlatformLayerTree; 39 settings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
40 settings.showPaintRects = webSettings.showPaintRects; 40 settings.showPaintRects = webSettings.showPaintRects;
41 settings.renderVSyncEnabled = webSettings.renderVSyncEnabled; 41 settings.renderVSyncEnabled = webSettings.renderVSyncEnabled;
42 settings.perTilePaintingEnabled = webSettings.perTilePaintingEnabled;
43 settings.acceleratedAnimationEnabled = webSettings.acceleratedAnimationEnabl ed;
44 settings.pageScalePinchZoomEnabled = webSettings.pageScalePinchZoomEnabled;
42 settings.refreshRate = webSettings.refreshRate; 45 settings.refreshRate = webSettings.refreshRate;
43 settings.defaultTileSize = webSettings.defaultTileSize; 46 settings.defaultTileSize = webSettings.defaultTileSize;
44 settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize; 47 settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize;
45 m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass()); 48 m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass());
46 if (!m_layerTreeHost.get()) 49 if (!m_layerTreeHost.get())
47 return false; 50 return false;
48 51
49 if (webSettings.showFPSCounter) 52 if (webSettings.showFPSCounter)
50 setShowFPSCounter(true); 53 setShowFPSCounter(true);
51 return true; 54 return true;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 { 273 {
271 m_client->didCompleteSwapBuffers(); 274 m_client->didCompleteSwapBuffers();
272 } 275 }
273 276
274 void WebLayerTreeViewImpl::scheduleComposite() 277 void WebLayerTreeViewImpl::scheduleComposite()
275 { 278 {
276 m_client->scheduleComposite(); 279 m_client->scheduleComposite();
277 } 280 }
278 281
279 } // namespace WebKit 282 } // namespace WebKit
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/web_compositor_support_impl.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698