third_party/WebKit/Source/core/paint/BlockPainter.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/paint/BlockPainter.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/page/scrolling/ScrollingCoordinator.cpp ('k') | third_party/WebKit/Source/core/paint/BoxBorderPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/BlockPainter.cpp

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

index a8305468f7a5169b31c886a43d5c75d43845679f..1a2509ca64729c47871a8405ea233170499e5499 100644

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

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

@@ -82,7 +82,7 @@ void BlockPainter::paintOverflowControlsIfNeeded(const PaintInfo& paintInfo, con

clipRect.moveBy(paintOffset);

clipRecorder.emplace(paintInfo.context, m_layoutBlock, DisplayItem::ClipScrollbarsToBoxBounds, clipRect);

}

- ScrollableAreaPainter(*m_layoutBlock.layer()->scrollableArea()).paintOverflowControls(paintInfo.context, roundedIntPoint(paintOffset), paintInfo.cullRect(), false /* paintingOverlayControls */);

+ ScrollableAreaPainter(*m_layoutBlock.layer()->getScrollableArea()).paintOverflowControls(paintInfo.context, roundedIntPoint(paintOffset), paintInfo.cullRect(), false /* paintingOverlayControls */);

}

@@ -162,9 +162,9 @@ void BlockPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& pa

if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {

const auto* objectProperties = m_layoutBlock.objectPaintProperties();

if (auto* scrollTranslation = objectProperties ? objectProperties->scrollTranslation() : nullptr) {

- PaintChunkProperties properties(paintInfo.context.paintController().currentPaintChunkProperties());

+ PaintChunkProperties properties(paintInfo.context.getPaintController().currentPaintChunkProperties());

properties.transform = scrollTranslation;

- m_scopedScrollProperty.emplace(paintInfo.context.paintController(), properties);

+ m_scopedScrollProperty.emplace(paintInfo.context.getPaintController(), properties);

scrolledPaintInfo.emplace(paintInfo);

scrolledPaintInfo->updateCullRect(scrollTranslation->matrix().toAffineTransform());

}