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

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

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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_impl_unittest.cc ('k') | cc/layers/ui_resource_layer_impl_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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 shared_bitmap_manager_.get(), 112 shared_bitmap_manager_.get(),
113 nullptr, 113 nullptr,
114 nullptr, 114 nullptr,
115 0, 115 0,
116 false, 116 false,
117 1); 117 1);
118 host_impl_ = make_scoped_ptr( 118 host_impl_ = make_scoped_ptr(
119 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get())); 119 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get()));
120 } 120 }
121 121
122 virtual ~TiledLayerTest() { 122 ~TiledLayerTest() override {
123 ResourceManagerClearAllMemory(resource_manager_.get(), 123 ResourceManagerClearAllMemory(resource_manager_.get(),
124 resource_provider_.get()); 124 resource_provider_.get());
125 125
126 DebugScopedSetImplThreadAndMainThreadBlocked 126 DebugScopedSetImplThreadAndMainThreadBlocked
127 impl_thread_and_main_thread_blocked(proxy_); 127 impl_thread_and_main_thread_blocked(proxy_);
128 resource_provider_ = nullptr; 128 resource_provider_ = nullptr;
129 host_impl_ = nullptr; 129 host_impl_ = nullptr;
130 } 130 }
131 131
132 void ResourceManagerClearAllMemory( 132 void ResourceManagerClearAllMemory(
(...skipping 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 1746
1747 // Rounding leads to an extra pixel. 1747 // Rounding leads to an extra pixel.
1748 gfx::Rect expanded_layer_rect(layer_rect); 1748 gfx::Rect expanded_layer_rect(layer_rect);
1749 expanded_layer_rect.set_height(32); 1749 expanded_layer_rect.set_height(32);
1750 EXPECT_EQ(expanded_layer_rect, 1750 EXPECT_EQ(expanded_layer_rect,
1751 layer->tracking_layer_painter()->PaintedRect()); 1751 layer->tracking_layer_painter()->PaintedRect());
1752 } 1752 }
1753 1753
1754 } // namespace 1754 } // namespace
1755 } // namespace cc 1755 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/tiled_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698