third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp - Issue 1599673002: compositor-worker: Remove code from cc_blink

Unified Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.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

« cc/animation/layer_tree_mutations.h ('K') | « third_party/WebKit/Source/core/dom/Element.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp » ('j') | third_party/WebKit/Source/platform/graphics/CompositorMutableProperties.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

index 7c798e24b2f8ed91695544f366d613df323f2ae2..5b4631260e0c974203e8451dfdbe9fb20b5520bc 100644

--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

@@ -60,12 +60,12 @@

#include "platform/fonts/FontCache.h"

#include "platform/geometry/TransformState.h"

#include "platform/graphics/BitmapImage.h"

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

#include "platform/graphics/GraphicsContext.h"

#include "platform/graphics/paint/ClipDisplayItem.h"

#include "platform/graphics/paint/CullRect.h"

#include "platform/graphics/paint/PaintController.h"

#include "platform/graphics/paint/TransformDisplayItem.h"

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

#include "wtf/CurrentTime.h"

#include "wtf/text/StringBuilder.h"

@@ -1528,8 +1528,8 @@ void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties()

TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositedLayerMapping::updateElementId()");

uint64_t elementId = 0;

- uint32_t mainMutableProperties = WebCompositorMutablePropertyNone;

- uint32_t scrollMutableProperties = WebCompositorMutablePropertyNone;

+ uint32_t mainMutableProperties = CompositorMutablePropertyNone;

+ uint32_t scrollMutableProperties = CompositorMutablePropertyNone;

if (m_owningLayer.layoutObject()->style()->hasCompositorProxy()) {

if (Node* owningNode = m_owningLayer.layoutObject()->generatingNode()) {

@@ -1537,8 +1537,8 @@ void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties()

Element* owningElement = toElement(owningNode);

uint32_t compositorMutableProperties = owningElement->compositorMutableProperties();

elementId = DOMNodeIds::idForNode(owningNode);

- mainMutableProperties = (WebCompositorMutablePropertyOpacity | WebCompositorMutablePropertyTransform) & compositorMutableProperties;

- scrollMutableProperties = (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop) & compositorMutableProperties;

+ mainMutableProperties = (CompositorMutablePropertyOpacity | CompositorMutablePropertyTransform) & compositorMutableProperties;

+ scrollMutableProperties = (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop) & compositorMutableProperties;

}