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

Unified Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 1547893003: WIP - compositor worker mega patch. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
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..60daf824857f2bd5540ea8240b34c6c9c9a5184b 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"
@@ -218,9 +218,6 @@ PassOwnPtr<GraphicsLayer> CompositedLayerMapping::createGraphicsLayer(Compositin
OwnPtr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFactory, this);
graphicsLayer->setCompositingReasons(reasons);
- if (Node* owningNode = m_owningLayer.layoutObject()->generatingNode())
- graphicsLayer->setOwnerNodeId(DOMNodeIds::idForNode(owningNode));
-
return graphicsLayer.release();
}
@@ -1528,8 +1525,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 +1534,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;
}
}
}

Powered by Google App Engine
This is Rietveld 408576698