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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/layer_impl_unittest.cc

Issue 12674029: Chromify layer_impl_unittest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl_unittest.cc
diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
index e67a66e7455458af71432a741710007aabb17da7..8b493c327b8aa19c2116f87ddb87e13bc5891a00 100644
--- a/cc/layers/layer_impl_unittest.cc
+++ b/cc/layers/layer_impl_unittest.cc
@@ -20,235 +20,282 @@ using namespace WebKit;
namespace cc {
namespace {
-#define EXECUTE_AND_VERIFY_SUBTREE_CHANGED(codeToTest) \
- root->ResetAllChangeTrackingForSubtree(); \
- codeToTest; \
- EXPECT_TRUE(root->LayerPropertyChanged()); \
- EXPECT_TRUE(child->LayerPropertyChanged()); \
- EXPECT_TRUE(grandChild->LayerPropertyChanged()); \
- EXPECT_FALSE(root->LayerSurfacePropertyChanged())
-
-
-#define EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(codeToTest) \
- root->ResetAllChangeTrackingForSubtree(); \
- codeToTest; \
- EXPECT_FALSE(root->LayerPropertyChanged()); \
- EXPECT_FALSE(child->LayerPropertyChanged()); \
- EXPECT_FALSE(grandChild->LayerPropertyChanged()); \
- EXPECT_FALSE(root->LayerSurfacePropertyChanged())
-
-#define EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(codeToTest) \
- root->ResetAllChangeTrackingForSubtree(); \
- codeToTest; \
- EXPECT_TRUE(root->LayerPropertyChanged()); \
- EXPECT_FALSE(child->LayerPropertyChanged()); \
- EXPECT_FALSE(grandChild->LayerPropertyChanged()); \
- EXPECT_FALSE(root->LayerSurfacePropertyChanged())
-
-#define EXECUTE_AND_VERIFY_ONLY_SURFACE_CHANGED(codeToTest) \
- root->ResetAllChangeTrackingForSubtree(); \
- codeToTest; \
- EXPECT_FALSE(root->LayerPropertyChanged()); \
- EXPECT_FALSE(child->LayerPropertyChanged()); \
- EXPECT_FALSE(grandChild->LayerPropertyChanged()); \
- EXPECT_TRUE(root->LayerSurfacePropertyChanged())
-
-#define VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(codeToTest) \
- root->ResetAllChangeTrackingForSubtree(); \
- hostImpl.ForcePrepareToDraw(); \
- EXPECT_FALSE(hostImpl.active_tree()->needs_update_draw_properties()); \
- codeToTest; \
- EXPECT_TRUE(hostImpl.active_tree()->needs_update_draw_properties());
-
-#define VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(codeToTest) \
- root->ResetAllChangeTrackingForSubtree(); \
- hostImpl.ForcePrepareToDraw(); \
- EXPECT_FALSE(hostImpl.active_tree()->needs_update_draw_properties()); \
- codeToTest; \
- EXPECT_FALSE(hostImpl.active_tree()->needs_update_draw_properties());
-
-TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
-{
- //
- // This test checks that layerPropertyChanged() has the correct behavior.
- //
-
- // The constructor on this will fake that we are on the correct thread.
- // Create a simple LayerImpl tree:
- FakeImplProxy proxy;
- FakeLayerTreeHostImpl hostImpl(&proxy);
- EXPECT_TRUE(hostImpl.InitializeRenderer(CreateFakeOutputSurface()));
- scoped_ptr<LayerImpl> root = LayerImpl::Create(hostImpl.active_tree(), 1);
- root->AddChild(LayerImpl::Create(hostImpl.active_tree(), 2));
- LayerImpl* child = root->children()[0];
- child->AddChild(LayerImpl::Create(hostImpl.active_tree(), 3));
- LayerImpl* grandChild = child->children()[0];
-
- // Adding children is an internal operation and should not mark layers as changed.
- EXPECT_FALSE(root->LayerPropertyChanged());
- EXPECT_FALSE(child->LayerPropertyChanged());
- EXPECT_FALSE(grandChild->LayerPropertyChanged());
-
- gfx::PointF arbitraryPointF = gfx::PointF(0.125f, 0.25f);
- float arbitraryNumber = 0.352f;
- gfx::Size arbitrarySize = gfx::Size(111, 222);
- gfx::Point arbitraryPoint = gfx::Point(333, 444);
- gfx::Vector2d arbitraryVector2d = gfx::Vector2d(111, 222);
- gfx::Rect arbitraryRect = gfx::Rect(arbitraryPoint, arbitrarySize);
- gfx::RectF arbitraryRectF = gfx::RectF(arbitraryPointF, gfx::SizeF(1.234f, 5.678f));
- SkColor arbitraryColor = SkColorSetRGB(10, 20, 30);
- gfx::Transform arbitraryTransform;
- arbitraryTransform.Scale3d(0.1, 0.2, 0.3);
- WebFilterOperations arbitraryFilters;
- arbitraryFilters.append(WebFilterOperation::createOpacityFilter(0.5));
- skia::RefPtr<SkImageFilter> arbitraryFilter = skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
-
- // These properties are internal, and should not be considered "change" when they are used.
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->set_update_rect(arbitraryRectF));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetMaxScrollOffset(arbitraryVector2d));
-
- // Changing these properties affects the entire subtree of layers.
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetAnchorPoint(arbitraryPointF));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetAnchorPointZ(arbitraryNumber));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(arbitraryFilters));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(WebFilterOperations()));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilter(arbitraryFilter));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetMaskLayer(LayerImpl::Create(hostImpl.active_tree(), 4)));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetMasksToBounds(true));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetContentsOpaque(true));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetReplicaLayer(LayerImpl::Create(hostImpl.active_tree(), 5)));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetPosition(arbitraryPointF));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetPreserves3d(true));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetDoubleSided(false)); // constructor initializes it to "true".
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->ScrollBy(arbitraryVector2d));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetScrollDelta(gfx::Vector2d()));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetScrollOffset(arbitraryVector2d));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetImplTransform(arbitraryTransform));
-
- // Changing these properties only affects the layer itself.
- EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetContentBounds(arbitrarySize));
- EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetContentsScale(arbitraryNumber, arbitraryNumber));
- EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetDrawsContent(true));
- EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetBackgroundColor(SK_ColorGRAY));
- EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetBackgroundFilters(arbitraryFilters));
-
- // Changing these properties only affects how render surface is drawn
- EXECUTE_AND_VERIFY_ONLY_SURFACE_CHANGED(root->SetOpacity(arbitraryNumber));
- EXECUTE_AND_VERIFY_ONLY_SURFACE_CHANGED(root->SetTransform(arbitraryTransform));
-
- // Special case: check that sublayer transform changes all layer's descendants, but not the layer itself.
- root->ResetAllChangeTrackingForSubtree();
- root->SetSublayerTransform(arbitraryTransform);
- EXPECT_FALSE(root->LayerPropertyChanged());
- EXPECT_TRUE(child->LayerPropertyChanged());
- EXPECT_TRUE(grandChild->LayerPropertyChanged());
-
- // Special case: check that setBounds changes behavior depending on masksToBounds.
- root->SetMasksToBounds(false);
- EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetBounds(gfx::Size(135, 246)));
- root->SetMasksToBounds(true);
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetBounds(arbitrarySize)); // should be a different size than previous call, to ensure it marks tree changed.
-
- // After setting all these properties already, setting to the exact same values again should
- // not cause any change.
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetAnchorPoint(arbitraryPointF));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetAnchorPointZ(arbitraryNumber));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetMasksToBounds(true));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetPosition(arbitraryPointF));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetPreserves3d(true));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetTransform(arbitraryTransform));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetDoubleSided(false)); // constructor initializes it to "true".
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetScrollDelta(gfx::Vector2d()));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetScrollOffset(arbitraryVector2d));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetImplTransform(arbitraryTransform));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetContentBounds(arbitrarySize));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetContentsScale(arbitraryNumber, arbitraryNumber));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetContentsOpaque(true));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetOpacity(arbitraryNumber));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetDrawsContent(true));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetSublayerTransform(arbitraryTransform));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetBounds(arbitrarySize));
+#define EXECUTE_AND_VERIFY_SUBTREE_CHANGED(code_to_test) \
+ root->ResetAllChangeTrackingForSubtree(); \
+ code_to_test; \
+ EXPECT_TRUE(root->LayerPropertyChanged()); \
+ EXPECT_TRUE(child->LayerPropertyChanged()); \
+ EXPECT_TRUE(grand_child->LayerPropertyChanged()); \
+ EXPECT_FALSE(root->LayerSurfacePropertyChanged())
+
+#define EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(code_to_test) \
+ root->ResetAllChangeTrackingForSubtree(); \
+ code_to_test; \
+ EXPECT_FALSE(root->LayerPropertyChanged()); \
+ EXPECT_FALSE(child->LayerPropertyChanged()); \
+ EXPECT_FALSE(grand_child->LayerPropertyChanged()); \
+ EXPECT_FALSE(root->LayerSurfacePropertyChanged())
+
+#define EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(code_to_test) \
+ root->ResetAllChangeTrackingForSubtree(); \
+ code_to_test; \
+ EXPECT_TRUE(root->LayerPropertyChanged()); \
+ EXPECT_FALSE(child->LayerPropertyChanged()); \
+ EXPECT_FALSE(grand_child->LayerPropertyChanged()); \
+ EXPECT_FALSE(root->LayerSurfacePropertyChanged())
+
+#define EXECUTE_AND_VERIFY_ONLY_SURFACE_CHANGED(code_to_test) \
+ root->ResetAllChangeTrackingForSubtree(); \
+ code_to_test; \
+ EXPECT_FALSE(root->LayerPropertyChanged()); \
+ EXPECT_FALSE(child->LayerPropertyChanged()); \
+ EXPECT_FALSE(grand_child->LayerPropertyChanged()); \
+ EXPECT_TRUE(root->LayerSurfacePropertyChanged())
+
+#define VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(code_to_test) \
+ root->ResetAllChangeTrackingForSubtree(); \
+ host_impl.ForcePrepareToDraw(); \
+ EXPECT_FALSE(host_impl.active_tree()->needs_update_draw_properties()); \
+ code_to_test; \
+ EXPECT_TRUE(host_impl.active_tree()->needs_update_draw_properties());
+
+#define VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(code_to_test) \
+ root->ResetAllChangeTrackingForSubtree(); \
+ host_impl.ForcePrepareToDraw(); \
+ EXPECT_FALSE(host_impl.active_tree()->needs_update_draw_properties()); \
+ code_to_test; \
+ EXPECT_FALSE(host_impl.active_tree()->needs_update_draw_properties());
+
+TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
+ //
+ // This test checks that layerPropertyChanged() has the correct behavior.
+ //
+
+ // The constructor on this will fake that we are on the correct thread.
+ // Create a simple LayerImpl tree:
+ FakeImplProxy proxy;
+ FakeLayerTreeHostImpl host_impl(&proxy);
+ EXPECT_TRUE(host_impl.InitializeRenderer(CreateFakeOutputSurface()));
+ scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.active_tree(), 1);
+ root->AddChild(LayerImpl::Create(host_impl.active_tree(), 2));
+ LayerImpl* child = root->children()[0];
+ child->AddChild(LayerImpl::Create(host_impl.active_tree(), 3));
+ LayerImpl* grand_child = child->children()[0];
+
+ // Adding children is an internal operation and should not mark layers as
+ // changed.
+ EXPECT_FALSE(root->LayerPropertyChanged());
+ EXPECT_FALSE(child->LayerPropertyChanged());
+ EXPECT_FALSE(grand_child->LayerPropertyChanged());
+
+ gfx::PointF arbitrary_point_f = gfx::PointF(0.125f, 0.25f);
+ float arbitrary_number = 0.352f;
+ gfx::Size arbitrary_size = gfx::Size(111, 222);
+ gfx::Point arbitrary_point = gfx::Point(333, 444);
+ gfx::Vector2d arbitrary_vector2d = gfx::Vector2d(111, 222);
+ gfx::Rect arbitrary_rect = gfx::Rect(arbitrary_point, arbitrary_size);
+ gfx::RectF arbitrary_rect_f =
+ gfx::RectF(arbitrary_point_f, gfx::SizeF(1.234f, 5.678f));
+ SkColor arbitrary_color = SkColorSetRGB(10, 20, 30);
+ gfx::Transform arbitrary_transform;
+ arbitrary_transform.Scale3d(0.1, 0.2, 0.3);
+ WebFilterOperations arbitrary_filters;
+ arbitrary_filters.append(WebFilterOperation::createOpacityFilter(0.5));
danakj 2013/03/22 15:51:34 float
ajuma 2013/03/22 15:55:42 Done.
+ skia::RefPtr<SkImageFilter> arbitrary_filter =
+ skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
+
+ // These properties are internal, and should not be considered "change" when
+ // they are used.
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->set_update_rect(arbitrary_rect_f));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetMaxScrollOffset(arbitrary_vector2d));
+
+ // Changing these properties affects the entire subtree of layers.
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetAnchorPoint(arbitrary_point_f));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetAnchorPointZ(arbitrary_number));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(arbitrary_filters));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(WebFilterOperations()));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilter(arbitrary_filter));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
+ root->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 4)));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetMasksToBounds(true));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetContentsOpaque(true));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
+ root->SetReplicaLayer(LayerImpl::Create(host_impl.active_tree(), 5)));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetPosition(arbitrary_point_f));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetPreserves3d(true));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
+ root->SetDoubleSided(false)); // constructor initializes it to "true".
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->ScrollBy(arbitrary_vector2d));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetScrollDelta(gfx::Vector2d()));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetScrollOffset(arbitrary_vector2d));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
+ root->SetImplTransform(arbitrary_transform));
+
+ // Changing these properties only affects the layer itself.
+ EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetContentBounds(arbitrary_size));
+ EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(
+ root->SetContentsScale(arbitrary_number, arbitrary_number));
+ EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetDrawsContent(true));
+ EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetBackgroundColor(SK_ColorGRAY));
+ EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(
+ root->SetBackgroundFilters(arbitrary_filters));
+
+ // Changing these properties only affects how render surface is drawn
+ EXECUTE_AND_VERIFY_ONLY_SURFACE_CHANGED(root->SetOpacity(arbitrary_number));
+ EXECUTE_AND_VERIFY_ONLY_SURFACE_CHANGED(
+ root->SetTransform(arbitrary_transform));
+
+ // Special case: check that sublayer transform changes all layer's
+ // descendants, but not the layer itself.
+ root->ResetAllChangeTrackingForSubtree();
+ root->SetSublayerTransform(arbitrary_transform);
+ EXPECT_FALSE(root->LayerPropertyChanged());
+ EXPECT_TRUE(child->LayerPropertyChanged());
+ EXPECT_TRUE(grand_child->LayerPropertyChanged());
+
+ // Special case: check that setBounds changes behavior depending on
+ // masksToBounds.
+ root->SetMasksToBounds(false);
+ EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetBounds(gfx::Size(135, 246)));
+ root->SetMasksToBounds(true);
+ // Should be a different size than previous call, to ensure it marks tree
+ // changed.
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetBounds(arbitrary_size));
+
+ // After setting all these properties already, setting to the exact same
+ // values again should not cause any change.
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetAnchorPoint(arbitrary_point_f));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetAnchorPointZ(arbitrary_number));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetMasksToBounds(true));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetPosition(arbitrary_point_f));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetPreserves3d(true));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetTransform(arbitrary_transform));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetDoubleSided(false)); // constructor initializes it to "true".
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetScrollDelta(gfx::Vector2d()));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetScrollOffset(arbitrary_vector2d));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetImplTransform(arbitrary_transform));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetContentBounds(arbitrary_size));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetContentsScale(arbitrary_number, arbitrary_number));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetContentsOpaque(true));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetOpacity(arbitrary_number));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetDrawsContent(true));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
+ root->SetSublayerTransform(arbitrary_transform));
+ EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetBounds(arbitrary_size));
}
-TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties)
-{
- FakeImplProxy proxy;
- FakeLayerTreeHostImpl hostImpl(&proxy);
- EXPECT_TRUE(hostImpl.InitializeRenderer(CreateFakeOutputSurface()));
- scoped_ptr<LayerImpl> root = LayerImpl::Create(hostImpl.active_tree(), 1);
-
- gfx::PointF arbitraryPointF = gfx::PointF(0.125f, 0.25f);
- float arbitraryNumber = 0.352f;
- gfx::Size arbitrarySize = gfx::Size(111, 222);
- gfx::Point arbitraryPoint = gfx::Point(333, 444);
- gfx::Vector2d arbitraryVector2d = gfx::Vector2d(111, 222);
- gfx::Vector2d largeVector2d = gfx::Vector2d(1000, 1000);
- gfx::Rect arbitraryRect = gfx::Rect(arbitraryPoint, arbitrarySize);
- gfx::RectF arbitraryRectF = gfx::RectF(arbitraryPointF, gfx::SizeF(1.234f, 5.678f));
- SkColor arbitraryColor = SkColorSetRGB(10, 20, 30);
- gfx::Transform arbitraryTransform;
- arbitraryTransform.Scale3d(0.1, 0.2, 0.3);
- WebFilterOperations arbitraryFilters;
- arbitraryFilters.append(WebFilterOperation::createOpacityFilter(0.5));
- skia::RefPtr<SkImageFilter> arbitraryFilter = skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
-
- // Related filter functions.
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitraryFilters));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitraryFilters));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(WebFilterOperations()));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitraryFilter));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitraryFilter));
-
- // Related scrolling functions.
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMaxScrollOffset(largeVector2d));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMaxScrollOffset(largeVector2d));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->ScrollBy(arbitraryVector2d));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->ScrollBy(gfx::Vector2d()));
- root->SetScrollDelta(gfx::Vector2d(0, 0));
- hostImpl.ForcePrepareToDraw();
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetScrollDelta(arbitraryVector2d));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetScrollDelta(arbitraryVector2d));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetScrollOffset(arbitraryVector2d));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetScrollOffset(arbitraryVector2d));
-
- // Unrelated functions, always set to new values, always set needs update.
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetAnchorPointZ(arbitraryNumber));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMaskLayer(LayerImpl::Create(hostImpl.active_tree(), 4)));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMasksToBounds(true));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentsOpaque(true));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetReplicaLayer(LayerImpl::Create(hostImpl.active_tree(), 5)));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPosition(arbitraryPointF));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPreserves3d(true));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDoubleSided(false)); // constructor initializes it to "true".
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetImplTransform(arbitraryTransform));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentBounds(arbitrarySize));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentsScale(arbitraryNumber, arbitraryNumber));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDrawsContent(true));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBackgroundColor(SK_ColorGRAY));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBackgroundFilters(arbitraryFilters));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetOpacity(arbitraryNumber));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetTransform(arbitraryTransform));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetSublayerTransform(arbitraryTransform));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBounds(arbitrarySize));
-
- // Unrelated functions, set to the same values, no needs update.
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetAnchorPointZ(arbitraryNumber));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitraryFilter));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMasksToBounds(true));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentsOpaque(true));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPosition(arbitraryPointF));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPreserves3d(true));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDoubleSided(false)); // constructor initializes it to "true".
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetImplTransform(arbitraryTransform));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentBounds(arbitrarySize));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentsScale(arbitraryNumber, arbitraryNumber));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDrawsContent(true));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBackgroundColor(SK_ColorGRAY));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBackgroundFilters(arbitraryFilters));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetOpacity(arbitraryNumber));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetTransform(arbitraryTransform));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetSublayerTransform(arbitraryTransform));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBounds(arbitrarySize));
+TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
+ FakeImplProxy proxy;
+ FakeLayerTreeHostImpl host_impl(&proxy);
+ EXPECT_TRUE(host_impl.InitializeRenderer(CreateFakeOutputSurface()));
+ scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.active_tree(), 1);
+
+ gfx::PointF arbitrary_point_f = gfx::PointF(0.125f, 0.25f);
+ float arbitrary_number = 0.352f;
+ gfx::Size arbitrary_size = gfx::Size(111, 222);
+ gfx::Point arbitrary_point = gfx::Point(333, 444);
+ gfx::Vector2d arbitrary_vector2d = gfx::Vector2d(111, 222);
+ gfx::Vector2d large_vector2d = gfx::Vector2d(1000, 1000);
+ gfx::Rect arbitrary_rect = gfx::Rect(arbitrary_point, arbitrary_size);
+ gfx::RectF arbitrary_rect_f =
+ gfx::RectF(arbitrary_point_f, gfx::SizeF(1.234f, 5.678f));
+ SkColor arbitrary_color = SkColorSetRGB(10, 20, 30);
+ gfx::Transform arbitrary_transform;
+ arbitrary_transform.Scale3d(0.1, 0.2, 0.3);
+ WebFilterOperations arbitrary_filters;
+ arbitrary_filters.append(WebFilterOperation::createOpacityFilter(0.5));
danakj 2013/03/22 15:51:34 float
ajuma 2013/03/22 15:55:42 Done.
+ skia::RefPtr<SkImageFilter> arbitrary_filter =
+ skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
+
+ // Related filter functions.
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitrary_filters));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitrary_filters));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(WebFilterOperations()));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitrary_filter));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitrary_filter));
+
+ // Related scrolling functions.
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMaxScrollOffset(large_vector2d));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetMaxScrollOffset(large_vector2d));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->ScrollBy(arbitrary_vector2d));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->ScrollBy(gfx::Vector2d()));
+ root->SetScrollDelta(gfx::Vector2d(0, 0));
+ host_impl.ForcePrepareToDraw();
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetScrollDelta(arbitrary_vector2d));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetScrollDelta(arbitrary_vector2d));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetScrollOffset(arbitrary_vector2d));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetScrollOffset(arbitrary_vector2d));
+
+ // Unrelated functions, always set to new values, always set needs update.
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetAnchorPointZ(arbitrary_number));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 4)));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMasksToBounds(true));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentsOpaque(true));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetReplicaLayer(LayerImpl::Create(host_impl.active_tree(), 5)));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPosition(arbitrary_point_f));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPreserves3d(true));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetDoubleSided(false)); // constructor initializes it to "true".
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetImplTransform(arbitrary_transform));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentBounds(arbitrary_size));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetContentsScale(arbitrary_number, arbitrary_number));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDrawsContent(true));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBackgroundColor(SK_ColorGRAY));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetBackgroundFilters(arbitrary_filters));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetOpacity(arbitrary_number));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetTransform(arbitrary_transform));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetSublayerTransform(arbitrary_transform));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBounds(arbitrary_size));
+
+ // Unrelated functions, set to the same values, no needs update.
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetAnchorPointZ(arbitrary_number));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitrary_filter));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMasksToBounds(true));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentsOpaque(true));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPosition(arbitrary_point_f));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPreserves3d(true));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetDoubleSided(false)); // constructor initializes it to "true".
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetImplTransform(arbitrary_transform));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetContentBounds(arbitrary_size));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetContentsScale(arbitrary_number, arbitrary_number));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDrawsContent(true));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetBackgroundColor(SK_ColorGRAY));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetBackgroundFilters(arbitrary_filters));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetOpacity(arbitrary_number));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetTransform(arbitrary_transform));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
+ root->SetSublayerTransform(arbitrary_transform));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBounds(arbitrary_size));
}
} // namespace
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698