third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp - Issue 1547893003: WIP - compositor worker mega patch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinder.cpp ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 16650e0a8010342a0719e344c0d6a99757e6305b..4fdb3ca294dfe79b29094898f00f560dc1eb4e7e 100644

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

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

@@ -55,13 +55,13 @@

#include "platform/RuntimeEnabledFeatures.h"

#include "platform/ScriptForbiddenScope.h"

#include "platform/TraceEvent.h"

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

#include "platform/graphics/GraphicsLayer.h"

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

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

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

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

#include "public/platform/Platform.h"

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

namespace blink {

@@ -396,10 +396,10 @@ void PaintLayerCompositor::updateIfNeeded()

if (RuntimeEnabledFeatures::compositorWorkerEnabled() && m_scrollLayer) {

if (Element* scrollingElement = m_layoutView.document().scrollingElement()) {

uint64_t elementId = 0;

- uint32_t mutableProperties = WebCompositorMutablePropertyNone;

+ uint32_t mutableProperties = CompositorMutablePropertyNone;

if (scrollingElement->hasCompositorProxy()) {

elementId = DOMNodeIds::idForNode(scrollingElement);

- mutableProperties = (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop) & scrollingElement->compositorMutableProperties();

+ mutableProperties = (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop) & scrollingElement->compositorMutableProperties();

}

m_scrollLayer->setElementId(elementId);

m_scrollLayer->setCompositorMutableProperties(mutableProperties);

@@ -980,7 +980,6 @@ void PaintLayerCompositor::ensureRootLayer()

IntRect overflowRect = m_layoutView.pixelSnappedLayoutOverflowRect();

m_rootContentLayer->setSize(FloatSize(overflowRect.maxX(), overflowRect.maxY()));

m_rootContentLayer->setPosition(FloatPoint());

- m_rootContentLayer->setOwnerNodeId(DOMNodeIds::idForNode(m_layoutView.generatingNode()));

// FIXME: with rootLayerScrolls, we probably don't even need m_rootContentLayer?

if (!(settings && settings->rootLayerScrolls())) {