third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp - Issue 1599673002: compositor-worker: Remove code from cc_blink

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

Issue 1599673002: compositor-worker: Remove code from cc_blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Attempt to fix build issue by updating dependencies of blink_platform_unittests. Created 4 years, 11 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/CompositorMutation.h ('K') | « third_party/WebKit/Source/platform/graphics/DEPS ('k') | third_party/WebKit/public/platform/WebCompositorMutableProperties.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 d5874a359ccb1a606ec7669b8e066e6391f29260..9966e70fc8096e1f3a528db50a84040a44e79121 100644

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

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

@@ -7,10 +7,10 @@

#include "core/layout/compositing/CompositedLayerMapping.h"

#include "core/layout/compositing/PaintLayerCompositor.h"

#include "core/page/Page.h"

+#include "platform/graphics/CompositorMutableProperties.h"

#include "platform/graphics/GraphicsLayer.h"

#include "platform/testing/URLTestHelpers.h"

#include "public/platform/Platform.h"

-#include "public/platform/WebCompositorMutableProperties.h"

#include "public/platform/WebLayer.h"

#include "public/platform/WebLayerTreeView.h"

#include "public/platform/WebUnitTestSupport.h"

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

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

WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);

- EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & WebCompositorMutablePropertyTransform);

- EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop | WebCompositorMutablePropertyOpacity));

+ EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutablePropertyTransform);

+ EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop | CompositorMutablePropertyOpacity));

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

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

WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);

- EXPECT_TRUE(scrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop));

- EXPECT_FALSE(scrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyTransform | WebCompositorMutablePropertyOpacity));

+ EXPECT_TRUE(scrollLayer->compositorMutableProperties() & (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop));

+ EXPECT_FALSE(scrollLayer->compositorMutableProperties() & (CompositorMutablePropertyTransform | CompositorMutablePropertyOpacity));

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

WebLayer* rootScrollLayer = getRootScrollLayer();

- EXPECT_TRUE(rootScrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop));

- EXPECT_FALSE(rootScrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyTransform | WebCompositorMutablePropertyOpacity));

+ EXPECT_TRUE(rootScrollLayer->compositorMutableProperties() & (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop));

+ EXPECT_FALSE(rootScrollLayer->compositorMutableProperties() & (CompositorMutablePropertyTransform | CompositorMutablePropertyOpacity));

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

}