| OLD | NEW |
| 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/render_surface_impl.h" | 5 #include "cc/render_surface_impl.h" |
| 6 | 6 |
| 7 #include "cc/append_quads_data.h" | 7 #include "cc/append_quads_data.h" |
| 8 #include "cc/layer_impl.h" | 8 #include "cc/layer_impl.h" |
| 9 #include "cc/render_pass_sink.h" | 9 #include "cc/render_pass_sink.h" |
| 10 #include "cc/scoped_ptr_vector.h" | 10 #include "cc/scoped_ptr_vector.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 EXECUTE_AND_VERIFY_SURFACE_CHANGED(renderSurface->setContentRect(testRect)); | 52 EXECUTE_AND_VERIFY_SURFACE_CHANGED(renderSurface->setContentRect(testRect)); |
| 53 | 53 |
| 54 owningLayer->setOpacity(0.5f); | 54 owningLayer->setOpacity(0.5f); |
| 55 EXPECT_TRUE(renderSurface->surfacePropertyChanged()); | 55 EXPECT_TRUE(renderSurface->surfacePropertyChanged()); |
| 56 owningLayer->resetAllChangeTrackingForSubtree(); | 56 owningLayer->resetAllChangeTrackingForSubtree(); |
| 57 | 57 |
| 58 // Setting the surface properties to the same values again should not be con
sidered "change". | 58 // Setting the surface properties to the same values again should not be con
sidered "change". |
| 59 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setClipRect(testRec
t)); | 59 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setClipRect(testRec
t)); |
| 60 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setContentRect(test
Rect)); | 60 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setContentRect(test
Rect)); |
| 61 | 61 |
| 62 scoped_ptr<LayerImpl> dummyMask = LayerImpl::create(hostImpl.activeTree(), 1
); | 62 scoped_ptr<LayerImpl> dummyMask = LayerImpl::create(hostImpl.activeTree(), 2
); |
| 63 gfx::Transform dummyMatrix; | 63 gfx::Transform dummyMatrix; |
| 64 dummyMatrix.Translate(1.0, 2.0); | 64 dummyMatrix.Translate(1.0, 2.0); |
| 65 | 65 |
| 66 // The rest of the surface properties are either internal and should not cau
se change, | 66 // The rest of the surface properties are either internal and should not cau
se change, |
| 67 // or they are already accounted for by the owninglayer->layerPropertyChange
d(). | 67 // or they are already accounted for by the owninglayer->layerPropertyChange
d(). |
| 68 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setDrawOpacity(0.5)
); | 68 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setDrawOpacity(0.5)
); |
| 69 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setDrawTransform(du
mmyMatrix)); | 69 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setDrawTransform(du
mmyMatrix)); |
| 70 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setReplicaDrawTrans
form(dummyMatrix)); | 70 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->setReplicaDrawTrans
form(dummyMatrix)); |
| 71 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->clearLayerLists()); | 71 EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->clearLayerLists()); |
| 72 } | 72 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 ASSERT_EQ(1u, passSink.renderPasses().size()); | 151 ASSERT_EQ(1u, passSink.renderPasses().size()); |
| 152 RenderPass* pass = passSink.renderPasses()[0]; | 152 RenderPass* pass = passSink.renderPasses()[0]; |
| 153 | 153 |
| 154 EXPECT_EQ(RenderPass::Id(2, 0), pass->id); | 154 EXPECT_EQ(RenderPass::Id(2, 0), pass->id); |
| 155 EXPECT_RECT_EQ(contentRect, pass->output_rect); | 155 EXPECT_RECT_EQ(contentRect, pass->output_rect); |
| 156 EXPECT_EQ(origin, pass->transform_to_root_target); | 156 EXPECT_EQ(origin, pass->transform_to_root_target); |
| 157 } | 157 } |
| 158 | 158 |
| 159 } // namespace | 159 } // namespace |
| 160 } // namespace cc | 160 } // namespace cc |
| OLD | NEW |