third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.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/css/CSSComputedStyleDeclaration.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/clipboard/DataTransfer.cpp ('k') | third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

index c129d6b298538affbc2de795b479bf57d74409b3..a525011174ce5e326c3d8f1aa81b9d4fd99de476 100644

--- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

+++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

@@ -424,11 +424,11 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValu

if (!style)

return nullptr;

- if (int keywordSize = style->fontDescription().keywordSize())

+ if (int keywordSize = style->getFontDescription().keywordSize())

return cssValuePool().createIdentifierValue(cssIdentifierForFontSizeKeyword(keywordSize));

- return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), *style);

+ return zoomAdjustedPixelValue(style->getFontDescription().computedPixelSize(), *style);

}

bool CSSComputedStyleDeclaration::isMonospaceFont() const

@@ -440,7 +440,7 @@ bool CSSComputedStyleDeclaration::isMonospaceFont() const

if (!style)

return false;

- return style->fontDescription().isMonospace();

+ return style->getFontDescription().isMonospace();

}

static void logUnimplementedPropertyID(CSSPropertyID propertyID)

@@ -612,8 +612,8 @@ bool CSSComputedStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID, c

if (propertyID == CSSPropertyFontSize && propertyValue->isPrimitiveValue() && m_node) {

m_node->document().updateLayoutIgnorePendingStylesheets();

const ComputedStyle* style = m_node->ensureComputedStyle(m_pseudoElementSpecifier);

- if (style && style->fontDescription().keywordSize()) {

- CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(style->fontDescription().keywordSize());

+ if (style && style->getFontDescription().keywordSize()) {

+ CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(style->getFontDescription().keywordSize());

const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(propertyValue);

if (primitiveValue->isValueID() && primitiveValue->getValueID() == sizeValue)

return true;