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

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

Issue 664803003: Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a (Closed) Base URL: git@github.com:domokit/mojo.git@master
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
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/output/gl_renderer.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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 CHECK(output_surface_->BindToClient(&output_surface_client_)); 121 CHECK(output_surface_->BindToClient(&output_surface_client_));
122 122
123 DebugScopedSetImplThreadAndMainThreadBlocked 123 DebugScopedSetImplThreadAndMainThreadBlocked
124 impl_thread_and_main_thread_blocked(proxy_); 124 impl_thread_and_main_thread_blocked(proxy_);
125 resource_provider_ = ResourceProvider::Create(output_surface_.get(), 125 resource_provider_ = ResourceProvider::Create(output_surface_.get(),
126 shared_bitmap_manager_.get(), 126 shared_bitmap_manager_.get(),
127 nullptr, 127 nullptr,
128 nullptr, 128 nullptr,
129 0, 129 0,
130 false, 130 false,
131 1, 131 1);
132 false);
133 host_impl_ = make_scoped_ptr( 132 host_impl_ = make_scoped_ptr(
134 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get())); 133 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get()));
135 } 134 }
136 135
137 virtual ~TiledLayerTest() { 136 virtual ~TiledLayerTest() {
138 ResourceManagerClearAllMemory(resource_manager_.get(), 137 ResourceManagerClearAllMemory(resource_manager_.get(),
139 resource_provider_.get()); 138 resource_provider_.get());
140 139
141 DebugScopedSetImplThreadAndMainThreadBlocked 140 DebugScopedSetImplThreadAndMainThreadBlocked
142 impl_thread_and_main_thread_blocked(proxy_); 141 impl_thread_and_main_thread_blocked(proxy_);
(...skipping 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1755 1754
1756 // Rounding leads to an extra pixel. 1755 // Rounding leads to an extra pixel.
1757 gfx::Rect expanded_layer_rect(layer_rect); 1756 gfx::Rect expanded_layer_rect(layer_rect);
1758 expanded_layer_rect.set_height(32); 1757 expanded_layer_rect.set_height(32);
1759 EXPECT_RECT_EQ(expanded_layer_rect, 1758 EXPECT_RECT_EQ(expanded_layer_rect,
1760 layer->tracking_layer_painter()->PaintedRect()); 1759 layer->tracking_layer_painter()->PaintedRect());
1761 } 1760 }
1762 1761
1763 } // namespace 1762 } // namespace
1764 } // namespace cc 1763 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/output/gl_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698