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

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

Issue 1489713004: Remove the clip parameter from ContentLayerClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clipremoval
Patch Set: Created 5 years 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_image_layer_unittest.cc ('k') | cc/playback/display_list_recording_source.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/layers/picture_layer.h" 5 #include "cc/layers/picture_layer.h"
6 6
7 #include "base/thread_task_runner_handle.h" 7 #include "base/thread_task_runner_handle.h"
8 #include "cc/layers/content_layer_client.h" 8 #include "cc/layers/content_layer_client.h"
9 #include "cc/layers/layer_settings.h" 9 #include "cc/layers/layer_settings.h"
10 #include "cc/layers/picture_layer_impl.h" 10 #include "cc/layers/picture_layer_impl.h"
11 #include "cc/playback/display_item_list_settings.h" 11 #include "cc/playback/display_item_list_settings.h"
12 #include "cc/test/fake_display_list_recording_source.h" 12 #include "cc/test/fake_display_list_recording_source.h"
13 #include "cc/test/fake_layer_tree_host.h" 13 #include "cc/test/fake_layer_tree_host.h"
14 #include "cc/test/fake_picture_layer.h" 14 #include "cc/test/fake_picture_layer.h"
15 #include "cc/test/fake_picture_layer_impl.h" 15 #include "cc/test/fake_picture_layer_impl.h"
16 #include "cc/test/fake_proxy.h" 16 #include "cc/test/fake_proxy.h"
17 #include "cc/test/layer_tree_settings_for_testing.h" 17 #include "cc/test/layer_tree_settings_for_testing.h"
18 #include "cc/test/test_shared_bitmap_manager.h" 18 #include "cc/test/test_shared_bitmap_manager.h"
19 #include "cc/test/test_task_graph_runner.h" 19 #include "cc/test/test_task_graph_runner.h"
20 #include "cc/trees/single_thread_proxy.h" 20 #include "cc/trees/single_thread_proxy.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 namespace cc { 23 namespace cc {
24 namespace { 24 namespace {
25 25
26 class MockContentLayerClient : public ContentLayerClient { 26 class MockContentLayerClient : public ContentLayerClient {
27 public: 27 public:
28 gfx::Rect PaintableRegion() override { return gfx::Rect(); } 28 gfx::Rect PaintableRegion() override { return gfx::Rect(); }
29 scoped_refptr<DisplayItemList> PaintContentsToDisplayList( 29 scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
30 const gfx::Rect& clip,
31 PaintingControlSetting picture_control) override { 30 PaintingControlSetting picture_control) override {
32 return DisplayItemList::Create(clip, DisplayItemListSettings()); 31 return DisplayItemList::Create(gfx::Rect(), DisplayItemListSettings());
33 } 32 }
34 bool FillsBoundsCompletely() const override { return false; }; 33 bool FillsBoundsCompletely() const override { return false; };
35 size_t GetApproximateUnsharedMemoryUsage() const override { return 0; } 34 size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
36 }; 35 };
37 36
38 TEST(PictureLayerTest, NoTilesIfEmptyBounds) { 37 TEST(PictureLayerTest, NoTilesIfEmptyBounds) {
39 MockContentLayerClient client; 38 MockContentLayerClient client;
40 scoped_refptr<PictureLayer> layer = 39 scoped_refptr<PictureLayer> layer =
41 PictureLayer::Create(LayerSettings(), &client); 40 PictureLayer::Create(LayerSettings(), &client);
42 layer->SetBounds(gfx::Size(10, 10)); 41 layer->SetBounds(gfx::Size(10, 10));
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 // Do a main frame, record the picture layers. The frame number has changed 167 // Do a main frame, record the picture layers. The frame number has changed
169 // non-monotonically. 168 // non-monotonically.
170 layer->SetNeedsDisplay(); 169 layer->SetNeedsDisplay();
171 host2->Composite(base::TimeTicks::Now()); 170 host2->Composite(base::TimeTicks::Now());
172 EXPECT_EQ(3, layer->update_count()); 171 EXPECT_EQ(3, layer->update_count());
173 EXPECT_EQ(1, host2->source_frame_number()); 172 EXPECT_EQ(1, host2->source_frame_number());
174 } 173 }
175 174
176 } // namespace 175 } // namespace
177 } // namespace cc 176 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_image_layer_unittest.cc ('k') | cc/playback/display_list_recording_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698