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

Side by Side Diff: cc/layers/heads_up_display_layer_impl.cc

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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 | « cc/layers/delegated_renderer_layer_impl_unittest.cc ('k') | cc/layers/layer_impl_unittest.cc » ('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 "cc/layers/heads_up_display_layer_impl.h" 5 #include "cc/layers/heads_up_display_layer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 double HeadsUpDisplayLayerImpl::Graph::UpdateUpperBound() { 63 double HeadsUpDisplayLayerImpl::Graph::UpdateUpperBound() {
64 double target_upper_bound = std::max(max, default_upper_bound); 64 double target_upper_bound = std::max(max, default_upper_bound);
65 current_upper_bound += (target_upper_bound - current_upper_bound) * 0.5; 65 current_upper_bound += (target_upper_bound - current_upper_bound) * 0.5;
66 return current_upper_bound; 66 return current_upper_bound;
67 } 67 }
68 68
69 HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl, 69 HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl,
70 int id) 70 int id)
71 : LayerImpl(tree_impl, id), 71 : LayerImpl(tree_impl, id),
72 typeface_(skia::AdoptRef(
73 SkTypeface::CreateFromName("monospace", SkTypeface::kBold))),
72 fps_graph_(60.0, 80.0), 74 fps_graph_(60.0, 80.0),
73 paint_time_graph_(16.0, 48.0), 75 paint_time_graph_(16.0, 48.0) {}
74 typeface_(skia::AdoptRef(
75 SkTypeface::CreateFromName("monospace", SkTypeface::kBold))) {}
76 76
77 HeadsUpDisplayLayerImpl::~HeadsUpDisplayLayerImpl() {} 77 HeadsUpDisplayLayerImpl::~HeadsUpDisplayLayerImpl() {}
78 78
79 scoped_ptr<LayerImpl> HeadsUpDisplayLayerImpl::CreateLayerImpl( 79 scoped_ptr<LayerImpl> HeadsUpDisplayLayerImpl::CreateLayerImpl(
80 LayerTreeImpl* tree_impl) { 80 LayerTreeImpl* tree_impl) {
81 return HeadsUpDisplayLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>(); 81 return HeadsUpDisplayLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
82 } 82 }
83 83
84 void HeadsUpDisplayLayerImpl::WillDraw(ResourceProvider* resource_provider) { 84 void HeadsUpDisplayLayerImpl::WillDraw(ResourceProvider* resource_provider) {
85 LayerImpl::WillDraw(resource_provider); 85 LayerImpl::WillDraw(resource_provider);
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 } 685 }
686 686
687 canvas->restore(); 687 canvas->restore();
688 } 688 }
689 689
690 const char* HeadsUpDisplayLayerImpl::LayerTypeAsString() const { 690 const char* HeadsUpDisplayLayerImpl::LayerTypeAsString() const {
691 return "HeadsUpDisplayLayer"; 691 return "HeadsUpDisplayLayer";
692 } 692 }
693 693
694 } // namespace cc 694 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl_unittest.cc ('k') | cc/layers/layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698