OLD | NEW |
---|---|
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 21 matching lines...) Expand all Loading... | |
32 } | 32 } |
33 | 33 |
34 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() | 34 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() |
35 { | 35 { |
36 } | 36 } |
37 | 37 |
38 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti ngs, scoped_ptr<Thread> implThread) | 38 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti ngs, scoped_ptr<Thread> implThread) |
39 { | 39 { |
40 LayerTreeSettings settings; | 40 LayerTreeSettings settings; |
41 settings.acceleratePainting = webSettings.acceleratePainting; | 41 settings.acceleratePainting = webSettings.acceleratePainting; |
42 settings.implSidePainting = CommandLine::ForCurrentProcess()->HasSwitch(cc:: switches::kEnableImplSidePainting); | |
aelias_OOO_until_Jul13
2012/11/30 04:33:07
I don't think you should be deleting this line? R
Leandro GraciĆ” Gil
2012/11/30 10:42:51
I'm not deleting it, but moving it to layer_tree_h
| |
43 settings.showDebugBorders = webSettings.showDebugBorders; | 42 settings.showDebugBorders = webSettings.showDebugBorders; |
44 settings.showPlatformLayerTree = webSettings.showPlatformLayerTree; | 43 settings.showPlatformLayerTree = webSettings.showPlatformLayerTree; |
45 settings.showPaintRects = webSettings.showPaintRects; | 44 settings.showPaintRects = webSettings.showPaintRects; |
46 settings.renderVSyncEnabled = webSettings.renderVSyncEnabled; | 45 settings.renderVSyncEnabled = webSettings.renderVSyncEnabled; |
47 settings.perTilePaintingEnabled = webSettings.perTilePaintingEnabled; | 46 settings.perTilePaintingEnabled = webSettings.perTilePaintingEnabled; |
48 settings.acceleratedAnimationEnabled = webSettings.acceleratedAnimationEnabl ed; | 47 settings.acceleratedAnimationEnabled = webSettings.acceleratedAnimationEnabl ed; |
49 settings.pageScalePinchZoomEnabled = webSettings.pageScalePinchZoomEnabled; | 48 settings.pageScalePinchZoomEnabled = webSettings.pageScalePinchZoomEnabled; |
50 settings.refreshRate = webSettings.refreshRate; | 49 settings.refreshRate = webSettings.refreshRate; |
51 settings.defaultTileSize = webSettings.defaultTileSize; | 50 settings.defaultTileSize = webSettings.defaultTileSize; |
52 settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize; | 51 settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize; |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
266 { | 265 { |
267 m_client->didCompleteSwapBuffers(); | 266 m_client->didCompleteSwapBuffers(); |
268 } | 267 } |
269 | 268 |
270 void WebLayerTreeViewImpl::scheduleComposite() | 269 void WebLayerTreeViewImpl::scheduleComposite() |
271 { | 270 { |
272 m_client->scheduleComposite(); | 271 m_client->scheduleComposite(); |
273 } | 272 } |
274 | 273 |
275 } // namespace WebKit | 274 } // namespace WebKit |
OLD | NEW |