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 "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 19 matching lines...) Expand all Loading... |
30 } | 30 } |
31 | 31 |
32 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() | 32 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() |
33 { | 33 { |
34 } | 34 } |
35 | 35 |
36 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
ngs, scoped_ptr<Thread> implThread) | 36 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
ngs, scoped_ptr<Thread> implThread) |
37 { | 37 { |
38 LayerTreeSettings settings; | 38 LayerTreeSettings settings; |
39 settings.acceleratePainting = webSettings.acceleratePainting; | 39 settings.acceleratePainting = webSettings.acceleratePainting; |
40 settings.showDebugBorders = webSettings.showDebugBorders; | |
41 settings.showPlatformLayerTree = webSettings.showPlatformLayerTree; | |
42 settings.showPaintRects = webSettings.showPaintRects; | |
43 settings.renderVSyncEnabled = webSettings.renderVSyncEnabled; | 40 settings.renderVSyncEnabled = webSettings.renderVSyncEnabled; |
44 settings.perTilePaintingEnabled = webSettings.perTilePaintingEnabled; | 41 settings.perTilePaintingEnabled = webSettings.perTilePaintingEnabled; |
45 settings.acceleratedAnimationEnabled = webSettings.acceleratedAnimationEnabl
ed; | 42 settings.acceleratedAnimationEnabled = webSettings.acceleratedAnimationEnabl
ed; |
46 settings.pageScalePinchZoomEnabled = webSettings.pageScalePinchZoomEnabled; | 43 settings.pageScalePinchZoomEnabled = webSettings.pageScalePinchZoomEnabled; |
47 settings.refreshRate = webSettings.refreshRate; | 44 settings.refreshRate = webSettings.refreshRate; |
48 settings.defaultTileSize = webSettings.defaultTileSize; | 45 settings.defaultTileSize = webSettings.defaultTileSize; |
49 settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize; | 46 settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize; |
| 47 settings.initialDebugState.showFPSCounter = webSettings.showFPSCounter; |
| 48 settings.initialDebugState.showPaintRects = webSettings.showPaintRects; |
| 49 settings.initialDebugState.showPlatformLayerTree = webSettings.showPlatformL
ayerTree; |
| 50 settings.initialDebugState.showDebugBorders = webSettings.showDebugBorders; |
50 m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass()); | 51 m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass()); |
51 if (!m_layerTreeHost.get()) | 52 if (!m_layerTreeHost.get()) |
52 return false; | 53 return false; |
53 | |
54 if (webSettings.showFPSCounter) | |
55 setShowFPSCounter(true); | |
56 return true; | 54 return true; |
57 } | 55 } |
58 | 56 |
59 void WebLayerTreeViewImpl::setSurfaceReady() | 57 void WebLayerTreeViewImpl::setSurfaceReady() |
60 { | 58 { |
61 m_layerTreeHost->setSurfaceReady(); | 59 m_layerTreeHost->setSurfaceReady(); |
62 } | 60 } |
63 | 61 |
64 void WebLayerTreeViewImpl::setRootLayer(const WebLayer& root) | 62 void WebLayerTreeViewImpl::setRootLayer(const WebLayer& root) |
65 { | 63 { |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 } | 170 } |
173 | 171 |
174 void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const | 172 void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const |
175 { | 173 { |
176 m_layerTreeHost->renderingStats( | 174 m_layerTreeHost->renderingStats( |
177 &static_cast<WebRenderingStatsImpl&>(stats).rendering_stats); | 175 &static_cast<WebRenderingStatsImpl&>(stats).rendering_stats); |
178 } | 176 } |
179 | 177 |
180 void WebLayerTreeViewImpl::setShowFPSCounter(bool show) | 178 void WebLayerTreeViewImpl::setShowFPSCounter(bool show) |
181 { | 179 { |
182 m_layerTreeHost->setShowFPSCounter(show); | 180 LayerTreeDebugState debugState = m_layerTreeHost->debugState(); |
| 181 debugState.showFPSCounter = show; |
| 182 m_layerTreeHost->setDebugState(debugState); |
183 } | 183 } |
184 | 184 |
185 void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectT
able[128], int fontHeight) { | 185 void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectT
able[128], int fontHeight) { |
186 setFontAtlas(asciiToWebRectTable, bitmap, fontHeight); | 186 setFontAtlas(asciiToWebRectTable, bitmap, fontHeight); |
187 } | 187 } |
188 | 188 |
189 void WebLayerTreeViewImpl::setFontAtlas(WebRect asciiToWebRectTable[128], const
SkBitmap& bitmap, int fontHeight) | 189 void WebLayerTreeViewImpl::setFontAtlas(WebRect asciiToWebRectTable[128], const
SkBitmap& bitmap, int fontHeight) |
190 { | 190 { |
191 gfx::Rect asciiToRectTable[128]; | 191 gfx::Rect asciiToRectTable[128]; |
192 for (int i = 0; i < 128; ++i) | 192 for (int i = 0; i < 128; ++i) |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 { | 263 { |
264 m_client->didCompleteSwapBuffers(); | 264 m_client->didCompleteSwapBuffers(); |
265 } | 265 } |
266 | 266 |
267 void WebLayerTreeViewImpl::scheduleComposite() | 267 void WebLayerTreeViewImpl::scheduleComposite() |
268 { | 268 { |
269 m_client->scheduleComposite(); | 269 m_client->scheduleComposite(); |
270 } | 270 } |
271 | 271 |
272 } // namespace WebKit | 272 } // namespace WebKit |
OLD | NEW |