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

Side by Side Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 565043002: cc: Remove the opaque rect return-parameter from ContentLayerClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: contentlayerclientopaque: build Created 6 years, 3 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/test/tiled_layer_test_common.cc ('k') | cc/trees/layer_tree_host_perftest.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/trees/layer_tree_host_common.h" 5 #include "cc/trees/layer_tree_host_common.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "cc/animation/layer_animation_controller.h" 9 #include "cc/animation/layer_animation_controller.h"
10 #include "cc/animation/transform_operations.h" 10 #include "cc/animation/transform_operations.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 bool LayerWithForcedDrawsContent::DrawsContent() const { return true; } 49 bool LayerWithForcedDrawsContent::DrawsContent() const { return true; }
50 50
51 class MockContentLayerClient : public ContentLayerClient { 51 class MockContentLayerClient : public ContentLayerClient {
52 public: 52 public:
53 MockContentLayerClient() {} 53 MockContentLayerClient() {}
54 virtual ~MockContentLayerClient() {} 54 virtual ~MockContentLayerClient() {}
55 virtual void PaintContents( 55 virtual void PaintContents(
56 SkCanvas* canvas, 56 SkCanvas* canvas,
57 const gfx::Rect& clip, 57 const gfx::Rect& clip,
58 gfx::RectF* opaque,
59 ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE {} 58 ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE {}
60 virtual void DidChangeLayerCanUseLCDText() OVERRIDE {} 59 virtual void DidChangeLayerCanUseLCDText() OVERRIDE {}
61 virtual bool FillsBoundsCompletely() const OVERRIDE { return false; } 60 virtual bool FillsBoundsCompletely() const OVERRIDE { return false; }
62 }; 61 };
63 62
64 scoped_refptr<ContentLayer> CreateDrawableContentLayer( 63 scoped_refptr<ContentLayer> CreateDrawableContentLayer(
65 ContentLayerClient* delegate) { 64 ContentLayerClient* delegate) {
66 scoped_refptr<ContentLayer> to_return = ContentLayer::Create(delegate); 65 scoped_refptr<ContentLayer> to_return = ContentLayer::Create(delegate);
67 to_return->SetIsDrawable(true); 66 to_return->SetIsDrawable(true);
68 return to_return; 67 return to_return;
(...skipping 8485 matching lines...) Expand 10 before | Expand all | Expand 10 after
8554 EXPECT_FLOAT_EQ(4.f, 8553 EXPECT_FLOAT_EQ(4.f,
8555 child1_layer->replica_layer() 8554 child1_layer->replica_layer()
8556 ->mask_layer() 8555 ->mask_layer()
8557 ->draw_properties() 8556 ->draw_properties()
8558 .device_scale_factor); 8557 .device_scale_factor);
8559 EXPECT_FLOAT_EQ(4.f, child2_layer->draw_properties().device_scale_factor); 8558 EXPECT_FLOAT_EQ(4.f, child2_layer->draw_properties().device_scale_factor);
8560 } 8559 }
8561 8560
8562 } // namespace 8561 } // namespace
8563 } // namespace cc 8562 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/tiled_layer_test_common.cc ('k') | cc/trees/layer_tree_host_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698