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

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

Issue 13637017: Delete layout_viewport_size. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android 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
« no previous file with comments | « cc/layers/tiled_layer_unittest.cc ('k') | cc/trees/layer_tree_host.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 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 "cc/animation/animation.h" 8 #include "cc/animation/animation.h"
9 #include "cc/animation/animation_registrar.h" 9 #include "cc/animation/animation_registrar.h"
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 scoped_refptr<Layer> root_layer = Layer::Create(); 414 scoped_refptr<Layer> root_layer = Layer::Create();
415 root_layer->SetAnchorPoint(gfx::PointF()); 415 root_layer->SetAnchorPoint(gfx::PointF());
416 root_layer->SetBounds(gfx::Size(1, 1)); 416 root_layer->SetBounds(gfx::Size(1, 1));
417 root_layer->SetIsDrawable(true); 417 root_layer->SetIsDrawable(true);
418 layer_tree_host_->SetRootLayer(root_layer); 418 layer_tree_host_->SetRootLayer(root_layer);
419 } 419 }
420 420
421 gfx::Size root_bounds = layer_tree_host_->root_layer()->bounds(); 421 gfx::Size root_bounds = layer_tree_host_->root_layer()->bounds();
422 gfx::Size device_root_bounds = gfx::ToCeiledSize( 422 gfx::Size device_root_bounds = gfx::ToCeiledSize(
423 gfx::ScaleSize(root_bounds, layer_tree_host_->device_scale_factor())); 423 gfx::ScaleSize(root_bounds, layer_tree_host_->device_scale_factor()));
424 layer_tree_host_->SetViewportSize(root_bounds, device_root_bounds); 424 layer_tree_host_->SetViewportSize(device_root_bounds);
425 } 425 }
426 426
427 void LayerTreeTest::Timeout() { 427 void LayerTreeTest::Timeout() {
428 timed_out_ = true; 428 timed_out_ = true;
429 EndTest(); 429 EndTest();
430 } 430 }
431 431
432 void LayerTreeTest::ScheduleComposite() { 432 void LayerTreeTest::ScheduleComposite() {
433 if (!started_ || scheduled_) 433 if (!started_ || scheduled_)
434 return; 434 return;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 ASSERT_FALSE(layer_tree_host_.get()); 560 ASSERT_FALSE(layer_tree_host_.get());
561 client_.reset(); 561 client_.reset();
562 if (timed_out_) { 562 if (timed_out_) {
563 FAIL() << "Test timed out"; 563 FAIL() << "Test timed out";
564 return; 564 return;
565 } 565 }
566 AfterTest(); 566 AfterTest();
567 } 567 }
568 568
569 } // namespace cc 569 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/tiled_layer_unittest.cc ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698