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

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

Issue 869433003: (not for commit) Simplified multi-threaded Ganesh with lock on Flush only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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/layers/picture_layer_impl.cc ('k') | cc/output/context_provider.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/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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 resource_manager_ = PrioritizedResourceManager::Create(proxy_); 101 resource_manager_ = PrioritizedResourceManager::Create(proxy_);
102 layer_tree_host_->SetLayerTreeHostClientReady(); 102 layer_tree_host_->SetLayerTreeHostClientReady();
103 CHECK(synchonous_output_surface_client_.EnsureOutputSurfaceCreated()); 103 CHECK(synchonous_output_surface_client_.EnsureOutputSurfaceCreated());
104 104
105 layer_tree_host_->SetRootLayer(Layer::Create()); 105 layer_tree_host_->SetRootLayer(Layer::Create());
106 106
107 CHECK(output_surface_->BindToClient(&output_surface_client_)); 107 CHECK(output_surface_->BindToClient(&output_surface_client_));
108 108
109 DebugScopedSetImplThreadAndMainThreadBlocked 109 DebugScopedSetImplThreadAndMainThreadBlocked
110 impl_thread_and_main_thread_blocked(proxy_); 110 impl_thread_and_main_thread_blocked(proxy_);
111 resource_provider_ = ResourceProvider::Create(output_surface_.get(), 111 resource_provider_ = ResourceProvider::Create(
112 shared_bitmap_manager_.get(), 112 output_surface_.get(), shared_bitmap_manager_.get(), nullptr, nullptr,
113 nullptr, 113 0, false, false, 1);
114 nullptr,
115 0,
116 false,
117 1);
118 host_impl_ = make_scoped_ptr( 114 host_impl_ = make_scoped_ptr(
119 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get())); 115 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get()));
120 } 116 }
121 117
122 ~TiledLayerTest() override { 118 ~TiledLayerTest() override {
123 ResourceManagerClearAllMemory(resource_manager_.get(), 119 ResourceManagerClearAllMemory(resource_manager_.get(),
124 resource_provider_.get()); 120 resource_provider_.get());
125 121
126 DebugScopedSetImplThreadAndMainThreadBlocked 122 DebugScopedSetImplThreadAndMainThreadBlocked
127 impl_thread_and_main_thread_blocked(proxy_); 123 impl_thread_and_main_thread_blocked(proxy_);
(...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 1742
1747 // Rounding leads to an extra pixel. 1743 // Rounding leads to an extra pixel.
1748 gfx::Rect expanded_layer_rect(layer_rect); 1744 gfx::Rect expanded_layer_rect(layer_rect);
1749 expanded_layer_rect.set_height(32); 1745 expanded_layer_rect.set_height(32);
1750 EXPECT_EQ(expanded_layer_rect, 1746 EXPECT_EQ(expanded_layer_rect,
1751 layer->tracking_layer_painter()->PaintedRect()); 1747 layer->tracking_layer_painter()->PaintedRect());
1752 } 1748 }
1753 1749
1754 } // namespace 1750 } // namespace
1755 } // namespace cc 1751 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer_impl.cc ('k') | cc/output/context_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698