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

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

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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_client.h ('k') | cc/test/fake_picture_pile.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 return num_children_that_draw_content + (layer->DrawsContent() ? 1 : 0); 79 return num_children_that_draw_content + (layer->DrawsContent() ? 1 : 0);
80 } 80 }
81 81
82 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawPropertiesForActiveTree() { 82 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawPropertiesForActiveTree() {
83 UpdateNumChildrenAndDrawProperties(active_tree()); 83 UpdateNumChildrenAndDrawProperties(active_tree());
84 } 84 }
85 85
86 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawProperties( 86 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawProperties(
87 LayerTreeImpl* layerTree) { 87 LayerTreeImpl* layerTree) {
88 RecursiveUpdateNumChildren(layerTree->root_layer()); 88 RecursiveUpdateNumChildren(layerTree->root_layer());
89 bool update_lcd_text = false; 89 layerTree->UpdateDrawProperties();
90 layerTree->UpdateDrawProperties(update_lcd_text);
91 } 90 }
92 91
93 } // namespace cc 92 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_layer_tree_host_client.h ('k') | cc/test/fake_picture_pile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698