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

Side by Side Diff: cc/resources/tile_manager_unittest.cc

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 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/resources/tile_manager_perftest.cc ('k') | cc/resources/video_resource_updater.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/resources/eviction_tile_priority_queue.h" 5 #include "cc/resources/eviction_tile_priority_queue.h"
6 #include "cc/resources/raster_tile_priority_queue.h" 6 #include "cc/resources/raster_tile_priority_queue.h"
7 #include "cc/resources/tile.h" 7 #include "cc/resources/tile.h"
8 #include "cc/resources/tile_priority.h" 8 #include "cc/resources/tile_priority.h"
9 #include "cc/test/fake_impl_proxy.h" 9 #include "cc/test/fake_impl_proxy.h"
10 #include "cc/test/fake_layer_tree_host_impl.h" 10 #include "cc/test/fake_layer_tree_host_impl.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 state.memory_limit_policy = memory_limit_policy_; 74 state.memory_limit_policy = memory_limit_policy_;
75 state.tree_priority = tree_priority; 75 state.tree_priority = tree_priority;
76 76
77 global_state_ = state; 77 global_state_ = state;
78 resource_pool_->SetResourceUsageLimits(state.soft_memory_limit_in_bytes, 78 resource_pool_->SetResourceUsageLimits(state.soft_memory_limit_in_bytes,
79 state.soft_memory_limit_in_bytes, 79 state.soft_memory_limit_in_bytes,
80 state.num_resources_limit); 80 state.num_resources_limit);
81 tile_manager_->SetGlobalStateForTesting(state); 81 tile_manager_->SetGlobalStateForTesting(state);
82 } 82 }
83 83
84 virtual void TearDown() OVERRIDE { 84 virtual void TearDown() override {
85 tile_manager_.reset(NULL); 85 tile_manager_.reset(NULL);
86 picture_pile_ = NULL; 86 picture_pile_ = NULL;
87 87
88 testing::Test::TearDown(); 88 testing::Test::TearDown();
89 } 89 }
90 90
91 // TileManagerClient implementation. 91 // TileManagerClient implementation.
92 virtual const std::vector<PictureLayerImpl*>& GetPictureLayers() 92 virtual const std::vector<PictureLayerImpl*>& GetPictureLayers()
93 const OVERRIDE { 93 const override {
94 return picture_layers_; 94 return picture_layers_;
95 } 95 }
96 virtual void NotifyReadyToActivate() OVERRIDE { ready_to_activate_ = true; } 96 virtual void NotifyReadyToActivate() override { ready_to_activate_ = true; }
97 virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE {} 97 virtual void NotifyTileStateChanged(const Tile* tile) override {}
98 virtual void BuildRasterQueue(RasterTilePriorityQueue* queue, 98 virtual void BuildRasterQueue(RasterTilePriorityQueue* queue,
99 TreePriority priority) OVERRIDE {} 99 TreePriority priority) override {}
100 virtual void BuildEvictionQueue(EvictionTilePriorityQueue* queue, 100 virtual void BuildEvictionQueue(EvictionTilePriorityQueue* queue,
101 TreePriority priority) OVERRIDE {} 101 TreePriority priority) override {}
102 102
103 TileVector CreateTilesWithSize(int count, 103 TileVector CreateTilesWithSize(int count,
104 TilePriority active_priority, 104 TilePriority active_priority,
105 TilePriority pending_priority, 105 TilePriority pending_priority,
106 const gfx::Size& tile_size) { 106 const gfx::Size& tile_size) {
107 TileVector tiles; 107 TileVector tiles;
108 for (int i = 0; i < count; ++i) { 108 for (int i = 0; i < count; ++i) {
109 scoped_refptr<Tile> tile = tile_manager_->CreateTile(picture_pile_.get(), 109 scoped_refptr<Tile> tile = tile_manager_->CreateTile(picture_pile_.get(),
110 tile_size, 110 tile_size,
111 gfx::Rect(), 111 gfx::Rect(),
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 state.tree_priority = tree_priority; 507 state.tree_priority = tree_priority;
508 508
509 global_state_ = state; 509 global_state_ = state;
510 host_impl_.resource_pool()->SetResourceUsageLimits( 510 host_impl_.resource_pool()->SetResourceUsageLimits(
511 state.soft_memory_limit_in_bytes, 511 state.soft_memory_limit_in_bytes,
512 state.soft_memory_limit_in_bytes, 512 state.soft_memory_limit_in_bytes,
513 state.num_resources_limit); 513 state.num_resources_limit);
514 host_impl_.tile_manager()->SetGlobalStateForTesting(state); 514 host_impl_.tile_manager()->SetGlobalStateForTesting(state);
515 } 515 }
516 516
517 virtual void SetUp() OVERRIDE { 517 virtual void SetUp() override {
518 InitializeRenderer(); 518 InitializeRenderer();
519 SetTreePriority(SAME_PRIORITY_FOR_BOTH_TREES); 519 SetTreePriority(SAME_PRIORITY_FOR_BOTH_TREES);
520 } 520 }
521 521
522 virtual void InitializeRenderer() { 522 virtual void InitializeRenderer() {
523 host_impl_.InitializeRenderer(FakeOutputSurface::Create3d()); 523 host_impl_.InitializeRenderer(FakeOutputSurface::Create3d());
524 } 524 }
525 525
526 void SetupDefaultTrees(const gfx::Size& layer_bounds) { 526 void SetupDefaultTrees(const gfx::Size& layer_bounds) {
527 gfx::Size tile_size(100, 100); 527 gfx::Size tile_size(100, 100);
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 all_tiles.insert(queue.Top()); 1135 all_tiles.insert(queue.Top());
1136 ++tile_count; 1136 ++tile_count;
1137 queue.Pop(); 1137 queue.Pop();
1138 } 1138 }
1139 EXPECT_EQ(tile_count, all_tiles.size()); 1139 EXPECT_EQ(tile_count, all_tiles.size());
1140 EXPECT_EQ(17u, tile_count); 1140 EXPECT_EQ(17u, tile_count);
1141 } 1141 }
1142 1142
1143 } // namespace 1143 } // namespace
1144 } // namespace cc 1144 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/tile_manager_perftest.cc ('k') | cc/resources/video_resource_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698