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

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

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 2 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/layer_test_common.cc ('k') | cc/tiles/picture_layer_tiling.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 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 "cc/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 796
797 void LayerTreeTest::SetupTree() { 797 void LayerTreeTest::SetupTree() {
798 if (!layer_tree_host_->root_layer()) { 798 if (!layer_tree_host_->root_layer()) {
799 scoped_refptr<Layer> root_layer = Layer::Create(layer_settings_); 799 scoped_refptr<Layer> root_layer = Layer::Create(layer_settings_);
800 root_layer->SetBounds(gfx::Size(1, 1)); 800 root_layer->SetBounds(gfx::Size(1, 1));
801 root_layer->SetIsDrawable(true); 801 root_layer->SetIsDrawable(true);
802 layer_tree_host_->SetRootLayer(root_layer); 802 layer_tree_host_->SetRootLayer(root_layer);
803 } 803 }
804 804
805 gfx::Size root_bounds = layer_tree_host_->root_layer()->bounds(); 805 gfx::Size root_bounds = layer_tree_host_->root_layer()->bounds();
806 gfx::Size device_root_bounds = gfx::ToCeiledSize( 806 gfx::Size device_root_bounds = gfx::ScaleToCeiledSize(
807 gfx::ScaleSize(root_bounds, layer_tree_host_->device_scale_factor())); 807 root_bounds, layer_tree_host_->device_scale_factor());
808 layer_tree_host_->SetViewportSize(device_root_bounds); 808 layer_tree_host_->SetViewportSize(device_root_bounds);
809 } 809 }
810 810
811 void LayerTreeTest::Timeout() { 811 void LayerTreeTest::Timeout() {
812 timed_out_ = true; 812 timed_out_ = true;
813 EndTest(); 813 EndTest();
814 } 814 }
815 815
816 void LayerTreeTest::RealEndTest() { 816 void LayerTreeTest::RealEndTest() {
817 // TODO(mithro): Make this method only end when not inside an impl frame. 817 // TODO(mithro): Make this method only end when not inside an impl frame.
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 LayerTreeHost* LayerTreeTest::layer_tree_host() { 997 LayerTreeHost* LayerTreeTest::layer_tree_host() {
998 // We check for a null proxy here as we sometimes ask for the layer tree host 998 // We check for a null proxy here as we sometimes ask for the layer tree host
999 // when the proxy does not exist, often for checking settings after a test has 999 // when the proxy does not exist, often for checking settings after a test has
1000 // completed. For example, LTHPixelResourceTest::RunPixelResourceTest. See 1000 // completed. For example, LTHPixelResourceTest::RunPixelResourceTest. See
1001 // elsewhere in this file for other examples. 1001 // elsewhere in this file for other examples.
1002 DCHECK(!proxy() || proxy()->IsMainThread() || proxy()->IsMainThreadBlocked()); 1002 DCHECK(!proxy() || proxy()->IsMainThread() || proxy()->IsMainThreadBlocked());
1003 return layer_tree_host_.get(); 1003 return layer_tree_host_.get();
1004 } 1004 }
1005 1005
1006 } // namespace cc 1006 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_test_common.cc ('k') | cc/tiles/picture_layer_tiling.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698