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

Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

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

index cc61a1398d413478ea9209a2efc7dbd7cc9cd433..d862aeb1dc14389067679e89239e7487a9450612 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

@@ -115,7 +115,7 @@ LayoutBoxModelObject::LayoutBoxModelObject(ContainerNode* node)

bool LayoutBoxModelObject::usesCompositedScrolling() const

{

- return hasOverflowClip() && hasLayer() && layer()->scrollableArea()->usesCompositedScrolling();

+ return hasOverflowClip() && hasLayer() && layer()->getScrollableArea()->usesCompositedScrolling();

}

LayoutBoxModelObject::~LayoutBoxModelObject()

@@ -322,9 +322,9 @@ bool LayoutBoxModelObject::hasSelfPaintingLayer() const

return m_layer && m_layer->isSelfPaintingLayer();

}

-PaintLayerScrollableArea* LayoutBoxModelObject::scrollableArea() const

+PaintLayerScrollableArea* LayoutBoxModelObject::getScrollableArea() const

{

- return m_layer ? m_layer->scrollableArea() : 0;

+ return m_layer ? m_layer->getScrollableArea() : 0;

}

void LayoutBoxModelObject::addLayerHitTestRects(LayerHitTestRects& rects, const PaintLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const

@@ -839,7 +839,7 @@ LayoutRect LayoutBoxModelObject::localCaretRectForEmptyElement(LayoutUnit width,

}

x = std::min(x, (maxX - caretWidth()).clampNegativeToZero());

- LayoutUnit height = LayoutUnit(style()->fontMetrics().height());

+ LayoutUnit height = LayoutUnit(style()->getFontMetrics().height());

LayoutUnit verticalSpace = lineHeight(true, currentStyle.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes) - height;

LayoutUnit y = paddingTop() + borderTop() + (verticalSpace / 2);

return currentStyle.isHorizontalWritingMode() ? LayoutRect(x, y, caretWidth(), height) : LayoutRect(y, x, height, caretWidth());