third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp - Issue 1973083002: Use element id's for animations

Unified Diff: third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

Issue 1973083002: Use element id's for animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get element id's from scroll node data directly. Created 4 years, 7 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

« third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp ('K') | « third_party/WebKit/Source/web/LinkHighlightImpl.cpp ('k') | third_party/WebKit/public/platform/WebLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

index c405ad1cce1f641d4f02b4f2cbd1bd39df321816..fedf29c4b7c0356ff768cc2e38a6a498ddfee935 100644

--- a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

+++ b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

@@ -140,19 +140,19 @@ TEST_F(CompositorWorkerTest, plumbingElementIdAndMutableProperties)

WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);

EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);

EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kOpacity));

- EXPECT_NE(0UL, proxiedLayer->elementId());

+ EXPECT_TRUE(proxiedLayer->elementId());

Element* scrollElement = document->getElementById("proxied-scroller");

WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);

EXPECT_TRUE(scrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));

EXPECT_FALSE(scrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kTransform | CompositorMutableProperty::kOpacity));

- EXPECT_NE(0UL, scrollLayer->elementId());

+ EXPECT_TRUE(scrollLayer->elementId());

WebLayer* rootScrollLayer = getRootScrollLayer();

EXPECT_TRUE(rootScrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));

EXPECT_FALSE(rootScrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kTransform | CompositorMutableProperty::kOpacity));

- EXPECT_NE(0UL, rootScrollLayer->elementId());

+ EXPECT_TRUE(rootScrollLayer->elementId());

}

TEST_F(CompositorWorkerTest, noProxies)

@@ -177,11 +177,9 @@ TEST_F(CompositorWorkerTest, noProxies)

Element* scrollElement = document->getElementById("proxied-scroller");

WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);

EXPECT_FALSE(!!scrollLayer->compositorMutableProperties());

- EXPECT_EQ(0UL, scrollLayer->elementId());

WebLayer* rootScrollLayer = getRootScrollLayer();

EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties());

- EXPECT_EQ(0UL, rootScrollLayer->elementId());

}

TEST_F(CompositorWorkerTest, disconnectedProxies)

@@ -206,11 +204,9 @@ TEST_F(CompositorWorkerTest, disconnectedProxies)

Element* scrollElement = document->getElementById("proxied-scroller");

WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);

EXPECT_FALSE(!!scrollLayer->compositorMutableProperties());

- EXPECT_EQ(0UL, scrollLayer->elementId());

WebLayer* rootScrollLayer = getRootScrollLayer();

EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties());

- EXPECT_EQ(0UL, rootScrollLayer->elementId());

}

TEST_F(CompositorWorkerTest, applyingMutationsMultipleElements)

@@ -227,8 +223,7 @@ TEST_F(CompositorWorkerTest, applyingMutationsMultipleElements)

WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);

EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);

EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kOpacity));

- uint64_t elementId = proxiedLayer->elementId();

- EXPECT_NE(0UL, elementId);

+ EXPECT_TRUE(proxiedLayer->elementId());

TransformationMatrix transformMatrix(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44);

CompositorMutation mutation;

@@ -245,8 +240,7 @@ TEST_F(CompositorWorkerTest, applyingMutationsMultipleElements)

WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);

EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kOpacity);

EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kTransform));

- uint64_t elementId = proxiedLayer->elementId();

- EXPECT_NE(0UL, elementId);

+ EXPECT_TRUE(proxiedLayer->elementId());

CompositorMutation mutation;

mutation.setOpacity(0.5);

@@ -273,8 +267,7 @@ TEST_F(CompositorWorkerTest, applyingMutationsMultipleProperties)

EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);

EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kOpacity);

EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));

- uint64_t elementId = proxiedLayer->elementId();

- EXPECT_NE(0UL, elementId);

+ EXPECT_TRUE(proxiedLayer->elementId());

TransformationMatrix transformMatrix(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44);

OwnPtr<CompositorMutation> mutation = adoptPtr(new CompositorMutation);