third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp - Issue 1599673002: compositor-worker: Remove code from cc_blink

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/paint/PaintLayerScrollableArea.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/layout/compositing/PaintLayerCompositor.cpp ('k') | third_party/WebKit/Source/platform/BUILD.gn » ('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/paint/PaintLayerScrollableArea.cpp

diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

index 0845a127ab98b51d7ccccba2b3023110ec98794a..af9a0252321d2bdf70ca974d6d3d371686dac30b 100644

--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

@@ -70,12 +70,12 @@

#include "core/paint/PaintLayerFragment.h"

#include "platform/PlatformGestureEvent.h"

#include "platform/PlatformMouseEvent.h"

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

#include "platform/graphics/GraphicsLayer.h"

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

#include "platform/scroll/ScrollAnimatorBase.h"

#include "platform/scroll/ScrollbarTheme.h"

#include "public/platform/Platform.h"

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

namespace blink {

@@ -1392,7 +1392,7 @@ static bool layerNeedsCompositedScrolling(PaintLayerScrollableArea::LCDTextMode

return false;

Node* node = layer->enclosingNode();

- if (node && node->isElementNode() && (toElement(node)->compositorMutableProperties() & (WebCompositorMutablePropertyScrollTop | WebCompositorMutablePropertyScrollLeft)))

+ if (node && node->isElementNode() && (toElement(node)->compositorMutableProperties() & (CompositorMutablePropertyScrollTop | CompositorMutablePropertyScrollLeft)))

return true;

if (mode == PaintLayerScrollableArea::ConsiderLCDText && !layer->compositor()->preferCompositingToLCDTextEnabled())