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

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

Issue 12967018: cc: Avoid pointless gfx::Point/Size contructors when making Rects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: RectFs as well Created 7 years, 9 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 | Annotate | Revision Log
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/base/scoped_ptr_vector.h" 5 #include "cc/base/scoped_ptr_vector.h"
6 #include "cc/layers/append_quads_data.h" 6 #include "cc/layers/append_quads_data.h"
7 #include "cc/layers/layer_impl.h" 7 #include "cc/layers/layer_impl.h"
8 #include "cc/layers/render_pass_sink.h" 8 #include "cc/layers/render_pass_sink.h"
9 #include "cc/layers/render_surface_impl.h" 9 #include "cc/layers/render_surface_impl.h"
10 #include "cc/quads/shared_quad_state.h" 10 #include "cc/quads/shared_quad_state.h"
(...skipping 24 matching lines...) Expand all
35 // This test checks that SurfacePropertyChanged() has the correct behavior. 35 // This test checks that SurfacePropertyChanged() has the correct behavior.
36 // 36 //
37 37
38 FakeImplProxy proxy; 38 FakeImplProxy proxy;
39 FakeLayerTreeHostImpl host_impl(&proxy); 39 FakeLayerTreeHostImpl host_impl(&proxy);
40 scoped_ptr<LayerImpl> owning_layer = 40 scoped_ptr<LayerImpl> owning_layer =
41 LayerImpl::Create(host_impl.active_tree(), 1); 41 LayerImpl::Create(host_impl.active_tree(), 1);
42 owning_layer->CreateRenderSurface(); 42 owning_layer->CreateRenderSurface();
43 ASSERT_TRUE(owning_layer->render_surface()); 43 ASSERT_TRUE(owning_layer->render_surface());
44 RenderSurfaceImpl* render_surface = owning_layer->render_surface(); 44 RenderSurfaceImpl* render_surface = owning_layer->render_surface();
45 gfx::Rect test_rect = gfx::Rect(gfx::Point(3, 4), gfx::Size(5, 6)); 45 gfx::Rect test_rect(3, 4, 5, 6);
46 owning_layer->ResetAllChangeTrackingForSubtree(); 46 owning_layer->ResetAllChangeTrackingForSubtree();
47 47
48 // Currently, the content_rect, clip_rect, and 48 // Currently, the content_rect, clip_rect, and
49 // owning_layer->layerPropertyChanged() are the only sources of change. 49 // owning_layer->layerPropertyChanged() are the only sources of change.
50 EXECUTE_AND_VERIFY_SURFACE_CHANGED(render_surface->SetClipRect(test_rect)); 50 EXECUTE_AND_VERIFY_SURFACE_CHANGED(render_surface->SetClipRect(test_rect));
51 EXECUTE_AND_VERIFY_SURFACE_CHANGED(render_surface->SetContentRect(test_rect)); 51 EXECUTE_AND_VERIFY_SURFACE_CHANGED(render_surface->SetContentRect(test_rect));
52 52
53 owning_layer->SetOpacity(0.5f); 53 owning_layer->SetOpacity(0.5f);
54 EXPECT_TRUE(render_surface->SurfacePropertyChanged()); 54 EXPECT_TRUE(render_surface->SurfacePropertyChanged());
55 owning_layer->ResetAllChangeTrackingForSubtree(); 55 owning_layer->ResetAllChangeTrackingForSubtree();
(...skipping 30 matching lines...) Expand all
86 86
87 scoped_ptr<LayerImpl> owning_layer = 87 scoped_ptr<LayerImpl> owning_layer =
88 LayerImpl::Create(host_impl.active_tree(), 2); 88 LayerImpl::Create(host_impl.active_tree(), 2);
89 owning_layer->CreateRenderSurface(); 89 owning_layer->CreateRenderSurface();
90 ASSERT_TRUE(owning_layer->render_surface()); 90 ASSERT_TRUE(owning_layer->render_surface());
91 owning_layer->draw_properties().render_target = owning_layer.get(); 91 owning_layer->draw_properties().render_target = owning_layer.get();
92 RenderSurfaceImpl* render_surface = owning_layer->render_surface(); 92 RenderSurfaceImpl* render_surface = owning_layer->render_surface();
93 93
94 root_layer->AddChild(owning_layer.Pass()); 94 root_layer->AddChild(owning_layer.Pass());
95 95
96 gfx::Rect content_rect = gfx::Rect(gfx::Point(), gfx::Size(50, 50)); 96 gfx::Rect content_rect(0, 0, 50, 50);
97 gfx::Rect clip_rect = gfx::Rect(gfx::Point(5, 5), gfx::Size(40, 40)); 97 gfx::Rect clip_rect(5, 5, 40, 40);
98 gfx::Transform origin; 98 gfx::Transform origin;
99 99
100 origin.Translate(30, 40); 100 origin.Translate(30, 40);
101 101
102 render_surface->SetDrawTransform(origin); 102 render_surface->SetDrawTransform(origin);
103 render_surface->SetContentRect(content_rect); 103 render_surface->SetContentRect(content_rect);
104 render_surface->SetClipRect(clip_rect); 104 render_surface->SetClipRect(clip_rect);
105 render_surface->SetDrawOpacity(1.f); 105 render_surface->SetDrawOpacity(1.f);
106 106
107 QuadList quad_list; 107 QuadList quad_list;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 scoped_ptr<LayerImpl> owning_layer = 150 scoped_ptr<LayerImpl> owning_layer =
151 LayerImpl::Create(host_impl.active_tree(), 2); 151 LayerImpl::Create(host_impl.active_tree(), 2);
152 owning_layer->CreateRenderSurface(); 152 owning_layer->CreateRenderSurface();
153 ASSERT_TRUE(owning_layer->render_surface()); 153 ASSERT_TRUE(owning_layer->render_surface());
154 owning_layer->draw_properties().render_target = owning_layer.get(); 154 owning_layer->draw_properties().render_target = owning_layer.get();
155 RenderSurfaceImpl* render_surface = owning_layer->render_surface(); 155 RenderSurfaceImpl* render_surface = owning_layer->render_surface();
156 156
157 root_layer->AddChild(owning_layer.Pass()); 157 root_layer->AddChild(owning_layer.Pass());
158 158
159 gfx::Rect content_rect = gfx::Rect(gfx::Point(), gfx::Size(50, 50)); 159 gfx::Rect content_rect(0, 0, 50, 50);
160 gfx::Transform origin; 160 gfx::Transform origin;
161 origin.Translate(30.0, 40.0); 161 origin.Translate(30.0, 40.0);
162 162
163 render_surface->SetScreenSpaceTransform(origin); 163 render_surface->SetScreenSpaceTransform(origin);
164 render_surface->SetContentRect(content_rect); 164 render_surface->SetContentRect(content_rect);
165 165
166 TestRenderPassSink pass_sink; 166 TestRenderPassSink pass_sink;
167 167
168 render_surface->AppendRenderPasses(&pass_sink); 168 render_surface->AppendRenderPasses(&pass_sink);
169 169
170 ASSERT_EQ(1u, pass_sink.RenderPasses().size()); 170 ASSERT_EQ(1u, pass_sink.RenderPasses().size());
171 RenderPass* pass = pass_sink.RenderPasses()[0]; 171 RenderPass* pass = pass_sink.RenderPasses()[0];
172 172
173 EXPECT_EQ(RenderPass::Id(2, 0), pass->id); 173 EXPECT_EQ(RenderPass::Id(2, 0), pass->id);
174 EXPECT_RECT_EQ(content_rect, pass->output_rect); 174 EXPECT_RECT_EQ(content_rect, pass->output_rect);
175 EXPECT_EQ(origin, pass->transform_to_root_target); 175 EXPECT_EQ(origin, pass->transform_to_root_target);
176 } 176 }
177 177
178 } // namespace 178 } // namespace
179 } // namespace cc 179 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/nine_patch_layer_impl_unittest.cc ('k') | cc/layers/solid_color_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698