third_party/WebKit/Source/core/frame/LocalFrame.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/frame/LocalFrame.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. 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/frame/LocalDOMWindow.cpp ('k') | third_party/WebKit/Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp

diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

index 8028a4ffea59c2cb6e2257d56aa11f937dbdfb1b..96a0d16869d380276ff4d08e52071c5829df4917 100644

--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp

+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

@@ -115,7 +115,7 @@ public:

AffineTransform transform;

transform.scale(deviceScaleFactor, deviceScaleFactor);

transform.translate(-m_bounds.x(), -m_bounds.y());

- context().paintController().createAndAppend<BeginTransformDisplayItem>(*m_localFrame, transform);

+ context().getPaintController().createAndAppend<BeginTransformDisplayItem>(*m_localFrame, transform);

}

GraphicsContext& context() { return m_pictureBuilder->context(); }

@@ -124,7 +124,7 @@ public:

{

if (m_draggedNode && m_draggedNode->layoutObject())

m_draggedNode->layoutObject()->updateDragState(false);

- context().paintController().endItem<EndTransformDisplayItem>(*m_localFrame);

+ context().getPaintController().endItem<EndTransformDisplayItem>(*m_localFrame);

RefPtr<const SkPicture> recording = m_pictureBuilder->endRecording();

RefPtr<SkImage> skImage = adoptRef(SkImage::NewFromPicture(recording.get(),

SkISize::Make(m_bounds.width(), m_bounds.height()), nullptr, nullptr));

@@ -778,7 +778,7 @@ ScrollResult LocalFrame::applyScrollDelta(ScrollGranularity granularity, const F

if (remainingDelta.isZero())

return ScrollResult(delta.width(), delta.height(), 0.0f, 0.0f);

- ScrollResult result = view()->scrollableArea()->userScroll(granularity, remainingDelta);

+ ScrollResult result = view()->getScrollableArea()->userScroll(granularity, remainingDelta);

result.didScrollX = result.didScrollX || (remainingDelta.width() != delta.width());

result.didScrollY = result.didScrollY || (remainingDelta.height() != delta.height());