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

Unified Diff: Source/platform/graphics/paint/DisplayItemTransformTreeBuilderTest.cpp

Issue 1296963002: Put transform tree building in DisplayItemPropertyTreeBuilder. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: comment for inline capacity Created 5 years, 4 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 | « Source/platform/graphics/paint/DisplayItemTransformTreeBuilder.cpp ('k') | public/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/paint/DisplayItemTransformTreeBuilderTest.cpp
diff --git a/Source/platform/graphics/paint/DisplayItemTransformTreeBuilderTest.cpp b/Source/platform/graphics/paint/DisplayItemTransformTreeBuilderTest.cpp
deleted file mode 100644
index c00ecb6faffe7d29a530ad0ea0c6626079908c32..0000000000000000000000000000000000000000
--- a/Source/platform/graphics/paint/DisplayItemTransformTreeBuilderTest.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "config.h"
-#include "platform/graphics/paint/DisplayItemTransformTreeBuilder.h"
-
-#include "platform/graphics/paint/DisplayItem.h"
-#include "platform/graphics/paint/DisplayItemClient.h"
-#include "platform/graphics/paint/DisplayItemTransformTree.h"
-#include "platform/graphics/paint/Transform3DDisplayItem.h"
-#include "platform/transforms/TransformTestHelper.h"
-#include "platform/transforms/TransformationMatrix.h"
-#include "public/platform/WebDisplayItemTransformTree.h"
-#include <gtest/gtest.h>
-
-namespace blink {
-namespace {
-
-using RangeRecord = WebDisplayItemTransformTree::RangeRecord;
-
-struct DummyClient {
- DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
- String debugName() const { return "DummyClient"; }
-};
-
-class DummyDisplayItem final : public DisplayItem {
-public:
- DummyDisplayItem(const DummyClient& client) : DisplayItem(client, DisplayItem::DrawingFirst, sizeof(*this)) { }
-};
-
-class DisplayItemTransformTreeBuilderTest : public ::testing::Test {
-protected:
- DisplayItemTransformTreeBuilder& builder() { return m_builder; }
-
- void processDisplayItem(const DisplayItem& displayItem) { m_builder.processDisplayItem(displayItem); }
- void processDisplayItem(PassOwnPtr<DisplayItem> displayItem) { processDisplayItem(*displayItem); }
- void processDummyDisplayItem() { processDisplayItem(DummyDisplayItem(newDummyClient())); }
- const DummyClient& processBeginTransform3D(const TransformationMatrix& transform)
- {
- const DummyClient& client = newDummyClient();
- processDisplayItem(BeginTransform3DDisplayItem(client, DisplayItem::Transform3DElementTransform, transform));
- return client;
- }
- void processEndTransform3D(const DummyClient& client)
- {
- processDisplayItem(EndTransform3DDisplayItem(client, DisplayItem::transform3DTypeToEndTransform3DType(DisplayItem::Transform3DElementTransform)));
- }
-
-private:
- // This makes empty objects which can be used as display item clients.
- const DummyClient& newDummyClient()
- {
- m_dummyClients.append(adoptPtr(new DummyClient));
- return *m_dummyClients.last();
- }
-
- DisplayItemTransformTreeBuilder m_builder;
- Vector<OwnPtr<DummyClient>> m_dummyClients;
-};
-
-TEST_F(DisplayItemTransformTreeBuilderTest, NoDisplayItems)
-{
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- // There should be a root transform node.
- ASSERT_EQ(1u, tree.nodeCount());
- EXPECT_TRUE(tree.nodeAt(0).isRoot());
- EXPECT_EQ(WebDisplayItemTransformTree::kInvalidIndex, tree.nodeAt(0).parentNodeIndex);
-
- // There should be no range records, because there are no non-empty
- // transformed ranges.
- ASSERT_EQ(0u, tree.rangeRecordCount());
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, NoTransforms)
-{
- // Three dummy display items.
- processDummyDisplayItem();
- processDummyDisplayItem();
- processDummyDisplayItem();
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- // There should only be a root transform node.
- ASSERT_EQ(1u, tree.nodeCount());
- EXPECT_TRUE(tree.nodeAt(0).isRoot());
- EXPECT_EQ(WebDisplayItemTransformTree::kInvalidIndex, tree.nodeAt(0).parentNodeIndex);
-
- // There should be one range record, for the entire list.
- ASSERT_EQ(1u, tree.rangeRecordCount());
- EXPECT_EQ(RangeRecord(0, 3, 0), tree.rangeRecordAt(0));
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, IdentityTransform)
-{
- TransformationMatrix identity;
-
- // There's an identity transform here, but we should not make a node for it.
- processDummyDisplayItem();
- auto transformClient = processBeginTransform3D(identity);
- processDummyDisplayItem();
- processEndTransform3D(transformClient);
- processDummyDisplayItem();
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- // There should only be a root transform node.
- ASSERT_EQ(1u, tree.nodeCount());
- EXPECT_TRUE(tree.nodeAt(0).isRoot());
- EXPECT_EQ(WebDisplayItemTransformTree::kInvalidIndex, tree.nodeAt(0).parentNodeIndex);
-
- // There should be three range records.
- // Since the transform is the identity, these could be combined, but there
- // is not currently a special path for this case.
- ASSERT_EQ(3u, tree.rangeRecordCount());
- EXPECT_EQ(RangeRecord(0, 1, 0), tree.rangeRecordAt(0));
- EXPECT_EQ(RangeRecord(2, 3, 0), tree.rangeRecordAt(1));
- EXPECT_EQ(RangeRecord(4, 5, 0), tree.rangeRecordAt(2));
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, Only2DTranslation)
-{
- FloatSize offset(200.5, -100);
- TransformationMatrix translation;
- translation.translate(offset.width(), offset.height());
-
- // There's a translation here, but we should not make a node for it.
- processDummyDisplayItem();
- auto transformClient = processBeginTransform3D(translation);
- processDummyDisplayItem();
- processEndTransform3D(transformClient);
- processDummyDisplayItem();
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- // There should only be a root transform node.
- ASSERT_EQ(1u, tree.nodeCount());
- EXPECT_TRUE(tree.nodeAt(0).isRoot());
- EXPECT_EQ(WebDisplayItemTransformTree::kInvalidIndex, tree.nodeAt(0).parentNodeIndex);
-
- // There should be three ranges, even though there's only one node.
- // The middle one requires an offset.
- ASSERT_EQ(3u, tree.rangeRecordCount());
- EXPECT_EQ(RangeRecord(0, 1, 0, FloatSize()), tree.rangeRecordAt(0));
- EXPECT_EQ(RangeRecord(2, 3, 0, offset), tree.rangeRecordAt(1));
- EXPECT_EQ(RangeRecord(4, 5, 0, FloatSize()), tree.rangeRecordAt(2));
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, Nested2DTranslation)
-{
- FloatSize offset1(10, -40);
- TransformationMatrix translation1;
- translation1.translate(offset1.width(), offset1.height());
- FloatSize offset2(80, 80);
- TransformationMatrix translation2;
- translation2.translate(offset2.width(), offset2.height());
-
- // These drawings should share a transform node but have different range
- // record offsets.
- processDummyDisplayItem();
- auto transform1 = processBeginTransform3D(translation1);
- processDummyDisplayItem();
- auto transform2 = processBeginTransform3D(translation2);
- processDummyDisplayItem();
- processEndTransform3D(transform2);
- processEndTransform3D(transform1);
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- // There should only be a root transform node.
- ASSERT_EQ(1u, tree.nodeCount());
- EXPECT_TRUE(tree.nodeAt(0).isRoot());
- EXPECT_EQ(WebDisplayItemTransformTree::kInvalidIndex, tree.nodeAt(0).parentNodeIndex);
-
- // Check that the range records have the right offsets.
- ASSERT_EQ(3u, tree.rangeRecordCount());
- EXPECT_EQ(RangeRecord(0, 1, 0, FloatSize()), tree.rangeRecordAt(0));
- EXPECT_EQ(RangeRecord(2, 3, 0, offset1), tree.rangeRecordAt(1));
- EXPECT_EQ(RangeRecord(4, 5, 0, offset1 + offset2), tree.rangeRecordAt(2));
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, ZTranslation)
-{
- TransformationMatrix zTranslation;
- zTranslation.translate3d(0, 0, 1);
-
- // Z translation: we expect another node.
- processDummyDisplayItem();
- auto transformClient = processBeginTransform3D(zTranslation);
- processDummyDisplayItem();
- processEndTransform3D(transformClient);
- processDummyDisplayItem();
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- // There should be two nodes here.
- ASSERT_EQ(2u, tree.nodeCount());
- EXPECT_TRUE(tree.nodeAt(0).isRoot());
- EXPECT_EQ(0u, tree.nodeAt(1).parentNodeIndex);
-
- // There should be three range records.
- // The middle of these should be transformed, and the others should be
- // attached to the root node.
- ASSERT_EQ(3u, tree.rangeRecordCount());
- EXPECT_EQ(RangeRecord(0, 1, 0), tree.rangeRecordAt(0));
- EXPECT_EQ(RangeRecord(2, 3, 1), tree.rangeRecordAt(1));
- EXPECT_EQ(RangeRecord(4, 5, 0), tree.rangeRecordAt(2));
-}
-
-size_t nodeDepth(
- const WebDisplayItemTransformTree& tree,
- const WebDisplayItemTransformTree::TransformNode& node)
-{
- const auto* currentNode = &node;
- size_t depth = 0;
- while (!currentNode->isRoot()) {
- currentNode = &tree.parentNode(*currentNode);
- depth++;
- }
- return depth;
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, SkipUnnecessaryRangeRecords)
-{
- TransformationMatrix rotation;
- rotation.rotate(1 /* degrees */);
-
- // The only drawing is in the second transform.
- auto transform1 = processBeginTransform3D(rotation);
- auto transform2 = processBeginTransform3D(rotation);
- processDummyDisplayItem();
- auto transform3 = processBeginTransform3D(rotation);
- processEndTransform3D(transform3);
- processDummyDisplayItem();
- processEndTransform3D(transform2);
- processEndTransform3D(transform1);
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- // There should be only two ranges.
- // They must both belong to the same grandchild of the root node.
- ASSERT_EQ(2u, tree.rangeRecordCount());
- size_t transformNodeIndex = tree.rangeRecordAt(0).transformNodeIndex;
- EXPECT_EQ(2u, nodeDepth(tree, tree.nodeAt(transformNodeIndex)));
- EXPECT_EQ(RangeRecord(2, 3, transformNodeIndex), tree.rangeRecordAt(0));
- EXPECT_EQ(RangeRecord(5, 6, transformNodeIndex), tree.rangeRecordAt(1));
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, RootTransformNodeHasIdentityTransform)
-{
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
- ASSERT_EQ(1u, tree.nodeCount());
- EXPECT_TRUE(tree.nodeAt(0).matrix.isIdentity());
- EXPECT_TRANSFORMS_ALMOST_EQ(TransformationMatrix(), tree.nodeAt(0).matrix);
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, Transform3DMatrix)
-{
- TransformationMatrix matrix;
- matrix.rotate3d(45, 45, 45);
-
- auto transform1 = processBeginTransform3D(matrix);
- processDummyDisplayItem();
- processEndTransform3D(transform1);
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- const auto& rangeRecord = tree.rangeRecordAt(0);
- const auto& transformNode = tree.nodeAt(rangeRecord.transformNodeIndex);
- EXPECT_TRANSFORMS_ALMOST_EQ(matrix, transformNode.matrix);
-}
-
-TEST_F(DisplayItemTransformTreeBuilderTest, NestedTransformsAreNotCombined)
-{
- // It's up the consumer of the tree to multiply transformation matrices.
-
- TransformationMatrix matrix1;
- matrix1.rotate3d(45, 45, 45);
- TransformationMatrix matrix2;
- matrix2.translate3d(0, 10, 20);
- EXPECT_NE(matrix2, matrix1 * matrix2);
-
- auto transform1 = processBeginTransform3D(matrix1);
- auto transform2 = processBeginTransform3D(matrix2);
- processDummyDisplayItem();
- processEndTransform3D(transform2);
- processDummyDisplayItem();
- processEndTransform3D(transform1);
- WebDisplayItemTransformTree tree(builder().releaseTransformTree());
-
- const auto& transformNode = tree.nodeAt(tree.rangeRecordAt(0).transformNodeIndex);
- ASSERT_FALSE(transformNode.isRoot());
- EXPECT_TRANSFORMS_ALMOST_EQ(matrix2, transformNode.matrix);
- EXPECT_TRANSFORMS_ALMOST_EQ(matrix1, tree.parentNode(transformNode).matrix);
-}
-
-} // namespace
-} // namespace blink
« no previous file with comments | « Source/platform/graphics/paint/DisplayItemTransformTreeBuilder.cpp ('k') | public/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698