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

Side by Side Diff: cc/heads_up_display_layer.cc

Issue 11272042: improvements of the FPS counter in the HUDLayer (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to 165943 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
« no previous file with comments | « cc/frame_rate_counter.cc ('k') | cc/heads_up_display_layer_impl.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "config.h" 5 #include "config.h"
6 6
7 #include "cc/heads_up_display_layer.h" 7 #include "cc/heads_up_display_layer.h"
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "cc/heads_up_display_layer_impl.h" 10 #include "cc/heads_up_display_layer_impl.h"
11 #include "cc/layer_tree_host.h" 11 #include "cc/layer_tree_host.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create() 15 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create()
16 { 16 {
17 return make_scoped_refptr(new HeadsUpDisplayLayer()); 17 return make_scoped_refptr(new HeadsUpDisplayLayer());
18 } 18 }
19 19
20 HeadsUpDisplayLayer::HeadsUpDisplayLayer() 20 HeadsUpDisplayLayer::HeadsUpDisplayLayer()
21 : Layer() 21 : Layer()
22 { 22 {
23 23
24 setBounds(gfx::Size(512, 128)); 24 setBounds(gfx::Size(256, 128));
25 } 25 }
26 26
27 HeadsUpDisplayLayer::~HeadsUpDisplayLayer() 27 HeadsUpDisplayLayer::~HeadsUpDisplayLayer()
28 { 28 {
29 } 29 }
30 30
31 void HeadsUpDisplayLayer::update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&) 31 void HeadsUpDisplayLayer::update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&)
32 { 32 {
33 const LayerTreeSettings& settings = layerTreeHost()->settings(); 33 const LayerTreeSettings& settings = layerTreeHost()->settings();
34 int maxTextureSize = layerTreeHost()->rendererCapabilities().maxTextureSize; 34 int maxTextureSize = layerTreeHost()->rendererCapabilities().maxTextureSize;
35 35
36 gfx::Size bounds; 36 gfx::Size bounds;
37 if (settings.showPlatformLayerTree || settings.showDebugRects()) { 37 if (settings.showPlatformLayerTree || settings.showDebugRects()) {
38 int width = std::min(maxTextureSize, layerTreeHost()->deviceViewportSize ().width()); 38 int width = std::min(maxTextureSize, layerTreeHost()->deviceViewportSize ().width());
39 int height = std::min(maxTextureSize, layerTreeHost()->deviceViewportSiz e().height()); 39 int height = std::min(maxTextureSize, layerTreeHost()->deviceViewportSiz e().height());
40 bounds = gfx::Size(width, height); 40 bounds = gfx::Size(width, height);
41 } else { 41 } else {
42 bounds = gfx::Size(512, 128); 42 bounds = gfx::Size(256, 128);
43 } 43 }
44 44
45 setBounds(bounds); 45 setBounds(bounds);
46 } 46 }
47 47
48 bool HeadsUpDisplayLayer::drawsContent() const 48 bool HeadsUpDisplayLayer::drawsContent() const
49 { 49 {
50 return true; 50 return true;
51 } 51 }
52 52
(...skipping 13 matching lines...) Expand all
66 Layer::pushPropertiesTo(layerImpl); 66 Layer::pushPropertiesTo(layerImpl);
67 67
68 if (!m_fontAtlas.get()) 68 if (!m_fontAtlas.get())
69 return; 69 return;
70 70
71 HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl* >(layerImpl); 71 HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl* >(layerImpl);
72 hudLayerImpl->setFontAtlas(m_fontAtlas.Pass()); 72 hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
73 } 73 }
74 74
75 } 75 }
OLDNEW
« no previous file with comments | « cc/frame_rate_counter.cc ('k') | cc/heads_up_display_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698