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

Side by Side Diff: cc/layer_impl_unittest.cc

Issue 11472021: cc: Pass LayerTreeHostImpl to LayerImpl constructor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/layer_impl.cc ('k') | cc/layer_sorter_unittest.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/layer_impl.h" 5 #include "cc/layer_impl.h"
6 6
7 #include "cc/single_thread_proxy.h" 7 #include "cc/single_thread_proxy.h"
8 #include "cc/test/fake_impl_proxy.h"
9 #include "cc/test/fake_layer_tree_host_impl.h"
8 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
10 #include "third_party/skia/include/effects/SkBlurImageFilter.h" 12 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
11 #include <public/WebFilterOperation.h> 13 #include <public/WebFilterOperation.h>
12 #include <public/WebFilterOperations.h> 14 #include <public/WebFilterOperations.h>
13 15
14 using namespace WebKit; 16 using namespace WebKit;
15 17
16 namespace cc { 18 namespace cc {
17 namespace { 19 namespace {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 EXPECT_TRUE(root->layerSurfacePropertyChanged()) 52 EXPECT_TRUE(root->layerSurfacePropertyChanged())
51 53
52 TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly) 54 TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
53 { 55 {
54 // 56 //
55 // This test checks that layerPropertyChanged() has the correct behavior. 57 // This test checks that layerPropertyChanged() has the correct behavior.
56 // 58 //
57 59
58 // The constructor on this will fake that we are on the correct thread. 60 // The constructor on this will fake that we are on the correct thread.
59 // Create a simple LayerImpl tree: 61 // Create a simple LayerImpl tree:
60 scoped_ptr<LayerImpl> root = LayerImpl::create(1); 62 FakeImplProxy proxy;
61 root->addChild(LayerImpl::create(2)); 63 FakeLayerTreeHostImpl hostImpl(&proxy);
64 scoped_ptr<LayerImpl> root = LayerImpl::create(&hostImpl, 1);
65 root->addChild(LayerImpl::create(&hostImpl, 2));
62 LayerImpl* child = root->children()[0]; 66 LayerImpl* child = root->children()[0];
63 child->addChild(LayerImpl::create(3)); 67 child->addChild(LayerImpl::create(&hostImpl, 3));
64 LayerImpl* grandChild = child->children()[0]; 68 LayerImpl* grandChild = child->children()[0];
65 69
66 // Adding children is an internal operation and should not mark layers as ch anged. 70 // Adding children is an internal operation and should not mark layers as ch anged.
67 EXPECT_FALSE(root->layerPropertyChanged()); 71 EXPECT_FALSE(root->layerPropertyChanged());
68 EXPECT_FALSE(child->layerPropertyChanged()); 72 EXPECT_FALSE(child->layerPropertyChanged());
69 EXPECT_FALSE(grandChild->layerPropertyChanged()); 73 EXPECT_FALSE(grandChild->layerPropertyChanged());
70 74
71 gfx::PointF arbitraryPointF = gfx::PointF(0.125f, 0.25f); 75 gfx::PointF arbitraryPointF = gfx::PointF(0.125f, 0.25f);
72 float arbitraryNumber = 0.352f; 76 float arbitraryNumber = 0.352f;
73 gfx::Size arbitrarySize = gfx::Size(111, 222); 77 gfx::Size arbitrarySize = gfx::Size(111, 222);
(...skipping 12 matching lines...) Expand all
86 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setUseLCDText(true)); 90 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setUseLCDText(true));
87 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setUpdateRect(arbitraryRectF )); 91 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setUpdateRect(arbitraryRectF ));
88 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setMaxScrollOffset(arbitrary Vector2d)); 92 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setMaxScrollOffset(arbitrary Vector2d));
89 93
90 // Changing these properties affects the entire subtree of layers. 94 // Changing these properties affects the entire subtree of layers.
91 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPoint(arbitraryPointF)); 95 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPoint(arbitraryPointF));
92 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPointZ(arbitraryNumber)); 96 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPointZ(arbitraryNumber));
93 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilters(arbitraryFilters)); 97 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilters(arbitraryFilters));
94 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilters(WebFilterOperations())); 98 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilters(WebFilterOperations()));
95 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilter(arbitraryFilter)); 99 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilter(arbitraryFilter));
96 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMaskLayer(LayerImpl::create(4))) ; 100 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMaskLayer(LayerImpl::create(&hos tImpl, 4)));
97 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMasksToBounds(true)); 101 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMasksToBounds(true));
98 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setContentsOpaque(true)); 102 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setContentsOpaque(true));
99 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setReplicaLayer(LayerImpl::create(5 ))); 103 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setReplicaLayer(LayerImpl::create(& hostImpl, 5)));
100 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPosition(arbitraryPointF)); 104 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPosition(arbitraryPointF));
101 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPreserves3D(true)); 105 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPreserves3D(true));
102 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setDoubleSided(false)); // construc tor initializes it to "true". 106 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setDoubleSided(false)); // construc tor initializes it to "true".
103 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->scrollBy(arbitraryVector2d)); 107 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->scrollBy(arbitraryVector2d));
104 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setScrollDelta(gfx::Vector2d())); 108 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setScrollDelta(gfx::Vector2d()));
105 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setScrollOffset(arbitraryVector2d)) ; 109 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setScrollOffset(arbitraryVector2d)) ;
106 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setImplTransform(arbitraryTransform )); 110 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setImplTransform(arbitraryTransform ));
107 111
108 // Changing these properties only affects the layer itself. 112 // Changing these properties only affects the layer itself.
109 EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->setContentBounds(arbitrarySize)) ; 113 EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->setContentBounds(arbitrarySize)) ;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setContentsScale(arbitraryNu mber, arbitraryNumber)); 149 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setContentsScale(arbitraryNu mber, arbitraryNumber));
146 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setContentsOpaque(true)); 150 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setContentsOpaque(true));
147 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setOpacity(arbitraryNumber)) ; 151 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setOpacity(arbitraryNumber)) ;
148 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setDrawsContent(true)); 152 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setDrawsContent(true));
149 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setSublayerTransform(arbitra ryTransform)); 153 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setSublayerTransform(arbitra ryTransform));
150 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setBounds(arbitrarySize)); 154 EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setBounds(arbitrarySize));
151 } 155 }
152 156
153 } // namespace 157 } // namespace
154 } // namespace cc 158 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layer_impl.cc ('k') | cc/layer_sorter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698