third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

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 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp ('k') | third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.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 0635acd1920d9dcd36fdcd8352606b7c30af75e7..fe5bff31cd69b7fd7556f403a28719326a685f88 100644

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

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

@@ -232,7 +232,7 @@ void PaintLayerCompositor::updateIfNeededRecursive()

DocumentAnimations::updateCompositorAnimations(m_layoutView.document());

- m_layoutView.frameView()->scrollableArea()->updateCompositorScrollAnimations();

+ m_layoutView.frameView()->getScrollableArea()->updateCompositorScrollAnimations();

if (const FrameView::ScrollableAreaSet* animatingScrollableAreas = m_layoutView.frameView()->animatingScrollableAreas()) {

for (ScrollableArea* scrollableArea : *animatingScrollableAreas)

scrollableArea->updateCompositorScrollAnimations();

@@ -623,7 +623,7 @@ void PaintLayerCompositor::rootFixedBackgroundsChanged()

bool PaintLayerCompositor::scrollingLayerDidChange(PaintLayer* layer)

{

if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())

- return scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer->scrollableArea());

+ return scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer->getScrollableArea());

return false;

}

@@ -707,7 +707,7 @@ GraphicsLayer* PaintLayerCompositor::frameScrollLayer() const

GraphicsLayer* PaintLayerCompositor::scrollLayer() const

{

- if (ScrollableArea* scrollableArea = m_layoutView.frameView()->scrollableArea())

+ if (ScrollableArea* scrollableArea = m_layoutView.frameView()->getScrollableArea())

return scrollableArea->layerForScrolling();

return nullptr;

}