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

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

Issue 1405993008: compositor-worker: plumb element id and mutable properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix rebase error. Created 5 years 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 c7c5c88f0d89e53fa86cfda45911f611adf2af21..99082f797ee31051ff82f6b9cde7b4bed366ea11 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -67,6 +67,7 @@
#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"
@@ -559,6 +560,8 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
if (layerConfigChanged || maskLayerChanged)
updatePaintingPhases();
+ updateElementIdAndCompositorMutableProperties();
+
return layerConfigChanged;
}
@@ -746,6 +749,7 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry(const PaintLayer* compo
updateContentsRect();
updateBackgroundColor();
updateDrawsContent();
+ updateElementIdAndCompositorMutableProperties();
updateContentsOpaque();
updateAfterPartResize();
updateRenderingContext();
@@ -1518,6 +1522,38 @@ void CompositedLayerMapping::updateShouldFlattenTransform()
}
}
+void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties()
+{
+ if (!RuntimeEnabledFeatures::compositorWorkerEnabled())
+ return;
+
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositedLayerMapping::updateElementId()");
+
+ uint64_t elementId = 0;
+ uint32_t mainMutableProperties = WebCompositorMutablePropertyNone;
+ uint32_t scrollMutableProperties = WebCompositorMutablePropertyNone;
+
+ if (m_owningLayer.layoutObject()->style()->hasCompositorProxy()) {
+ if (Node* owningNode = m_owningLayer.layoutObject()->generatingNode()) {
+ if (owningNode->isElementNode()) {
+ Element* owningElement = toElement(owningNode);
+ uint32_t compositorMutableProperties = owningElement->compositorMutableProperties();
+ elementId = DOMNodeIds::idForNode(owningNode);
+ mainMutableProperties = (WebCompositorMutablePropertyOpacity | WebCompositorMutablePropertyTransform) & compositorMutableProperties;
+ scrollMutableProperties = (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop) & compositorMutableProperties;
+ }
+ }
+ }
+
+ m_graphicsLayer->setElementId(elementId);
+ m_graphicsLayer->setCompositorMutableProperties(mainMutableProperties);
+
+ if (m_scrollingContentsLayer.get()) {
+ m_scrollingContentsLayer->setElementId(elementId);
+ m_scrollingContentsLayer->setCompositorMutableProperties(scrollMutableProperties);
+ }
+}
+
bool CompositedLayerMapping::updateForegroundLayer(bool needsForegroundLayer)
{
bool layerChanged = false;

Powered by Google App Engine
This is Rietveld 408576698