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

Side by Side Diff: cc/test/fake_layer_tree_host_impl.cc

Issue 787763006: cc: Adding BeginFrameTracker object and removing Now() from LTHI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase onto master. Created 5 years, 7 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
« no previous file with comments | « cc/test/fake_layer_tree_host_impl.h ('k') | cc/test/scheduler_test_common.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 "cc/test/begin_frame_args_test.h" 5 #include "cc/test/begin_frame_args_test.h"
6 #include "cc/test/fake_layer_tree_host_impl.h" 6 #include "cc/test/fake_layer_tree_host_impl.h"
7 #include "cc/test/test_shared_bitmap_manager.h" 7 #include "cc/test/test_shared_bitmap_manager.h"
8 #include "cc/trees/layer_tree_impl.h" 8 #include "cc/trees/layer_tree_impl.h"
9 9
10 namespace cc { 10 namespace cc {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 FakeLayerTreeHostImpl::~FakeLayerTreeHostImpl() {} 54 FakeLayerTreeHostImpl::~FakeLayerTreeHostImpl() {}
55 55
56 void FakeLayerTreeHostImpl::CreatePendingTree() { 56 void FakeLayerTreeHostImpl::CreatePendingTree() {
57 LayerTreeHostImpl::CreatePendingTree(); 57 LayerTreeHostImpl::CreatePendingTree();
58 float arbitrary_large_page_scale = 100000.f; 58 float arbitrary_large_page_scale = 100000.f;
59 pending_tree()->PushPageScaleFromMainThread( 59 pending_tree()->PushPageScaleFromMainThread(
60 1.f, 1.f / arbitrary_large_page_scale, arbitrary_large_page_scale); 60 1.f, 1.f / arbitrary_large_page_scale, arbitrary_large_page_scale);
61 } 61 }
62 62
63 BeginFrameArgs FakeLayerTreeHostImpl::CurrentBeginFrameArgs() const { 63 BeginFrameArgs FakeLayerTreeHostImpl::CurrentBeginFrameArgs() const {
64 if (!current_begin_frame_args_.IsValid()) 64 return current_begin_frame_tracker_.DangerousMethodCurrentOrLast();
65 return LayerTreeHostImpl::CurrentBeginFrameArgs();
66 return current_begin_frame_args_;
67 } 65 }
68 66
69 void FakeLayerTreeHostImpl::SetCurrentBeginFrameArgs( 67 void FakeLayerTreeHostImpl::SetCurrentBeginFrameArgs(
70 const BeginFrameArgs& args) { 68 const BeginFrameArgs& args) {
71 current_begin_frame_args_ = args; 69 if (!current_begin_frame_tracker_.DangerousMethodHasFinished()) {
70 current_begin_frame_tracker_.Finish();
71 }
72 current_begin_frame_tracker_.Start(args);
72 } 73 }
73 74
74 int FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(LayerImpl* layer) { 75 int FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(LayerImpl* layer) {
75 int num_children_that_draw_content = 0; 76 int num_children_that_draw_content = 0;
76 for (size_t i = 0; i < layer->children().size(); ++i) { 77 for (size_t i = 0; i < layer->children().size(); ++i) {
77 num_children_that_draw_content += 78 num_children_that_draw_content +=
78 RecursiveUpdateNumChildren(layer->children()[i]); 79 RecursiveUpdateNumChildren(layer->children()[i]);
79 } 80 }
80 if (layer->DrawsContent() && layer->HasDelegatedContent()) 81 if (layer->DrawsContent() && layer->HasDelegatedContent())
81 num_children_that_draw_content += 1000; 82 num_children_that_draw_content += 1000;
82 layer->SetNumDescendantsThatDrawContent(num_children_that_draw_content); 83 layer->SetNumDescendantsThatDrawContent(num_children_that_draw_content);
83 return num_children_that_draw_content + (layer->DrawsContent() ? 1 : 0); 84 return num_children_that_draw_content + (layer->DrawsContent() ? 1 : 0);
84 } 85 }
85 86
86 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawPropertiesForActiveTree() { 87 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawPropertiesForActiveTree() {
87 UpdateNumChildrenAndDrawProperties(active_tree()); 88 UpdateNumChildrenAndDrawProperties(active_tree());
88 } 89 }
89 90
90 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawProperties( 91 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawProperties(
91 LayerTreeImpl* layerTree) { 92 LayerTreeImpl* layerTree) {
92 RecursiveUpdateNumChildren(layerTree->root_layer()); 93 RecursiveUpdateNumChildren(layerTree->root_layer());
93 bool update_lcd_text = false; 94 bool update_lcd_text = false;
94 layerTree->UpdateDrawProperties(update_lcd_text); 95 layerTree->UpdateDrawProperties(update_lcd_text);
95 } 96 }
96 97
97 } // namespace cc 98 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_layer_tree_host_impl.h ('k') | cc/test/scheduler_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698