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

Side by Side Diff: cc/layers/tiled_layer_unittest.cc

Issue 606113003: Revert of Make cc output surface creation async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « cc/layers/solid_color_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer_unittest.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/layers/tiled_layer.h" 5 #include "cc/layers/tiled_layer.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 105 }
106 106
107 virtual void SetUp() { 107 virtual void SetUp() {
108 impl_thread_.Start(); 108 impl_thread_.Start();
109 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 109 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
110 layer_tree_host_ = SynchronousOutputSurfaceLayerTreeHost::Create( 110 layer_tree_host_ = SynchronousOutputSurfaceLayerTreeHost::Create(
111 &fake_layer_tree_host_client_, 111 &fake_layer_tree_host_client_,
112 shared_bitmap_manager_.get(), 112 shared_bitmap_manager_.get(),
113 settings_, 113 settings_,
114 impl_thread_.message_loop_proxy()); 114 impl_thread_.message_loop_proxy());
115 fake_layer_tree_host_client_.SetLayerTreeHost(layer_tree_host_.get());
116 proxy_ = layer_tree_host_->proxy(); 115 proxy_ = layer_tree_host_->proxy();
117 resource_manager_ = PrioritizedResourceManager::Create(proxy_); 116 resource_manager_ = PrioritizedResourceManager::Create(proxy_);
118 layer_tree_host_->SetLayerTreeHostClientReady(); 117 layer_tree_host_->SetLayerTreeHostClientReady();
119 CHECK(layer_tree_host_->EnsureOutputSurfaceCreated()); 118 CHECK(layer_tree_host_->EnsureOutputSurfaceCreated());
120 layer_tree_host_->SetRootLayer(Layer::Create()); 119 layer_tree_host_->SetRootLayer(Layer::Create());
121 120
122 CHECK(output_surface_->BindToClient(&output_surface_client_)); 121 CHECK(output_surface_->BindToClient(&output_surface_client_));
123 122
124 DebugScopedSetImplThreadAndMainThreadBlocked 123 DebugScopedSetImplThreadAndMainThreadBlocked
125 impl_thread_and_main_thread_blocked(proxy_); 124 impl_thread_and_main_thread_blocked(proxy_);
(...skipping 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after
1759 1758
1760 // Rounding leads to an extra pixel. 1759 // Rounding leads to an extra pixel.
1761 gfx::Rect expanded_layer_rect(layer_rect); 1760 gfx::Rect expanded_layer_rect(layer_rect);
1762 expanded_layer_rect.set_height(32); 1761 expanded_layer_rect.set_height(32);
1763 EXPECT_RECT_EQ(expanded_layer_rect, 1762 EXPECT_RECT_EQ(expanded_layer_rect,
1764 layer->tracking_layer_painter()->PaintedRect()); 1763 layer->tracking_layer_painter()->PaintedRect());
1765 } 1764 }
1766 1765
1767 } // namespace 1766 } // namespace
1768 } // namespace cc 1767 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/solid_color_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698