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

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

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

index 73a048414e3fce350df7649fde7671a232ec9927..fdfe9b47921c1d23db88047c98a4d187a92cef4e 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

@@ -555,7 +555,7 @@ PassRefPtr<ComputedStyle> StyleResolver::styleForDocument(Document& document)

RefPtr<ComputedStyle> documentStyle = ComputedStyle::create();

documentStyle->setRTLOrdering(document.visuallyOrdered() ? VisualOrder : LogicalOrder);

documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor() : 1);

- FontDescription documentFontDescription = documentStyle->fontDescription();

+ FontDescription documentFontDescription = documentStyle->getFontDescription();

documentFontDescription.setLocale(document.contentLanguage());

documentStyle->setFontDescription(documentFontDescription);

documentStyle->setZIndex(0);

@@ -1467,7 +1467,7 @@ void StyleResolver::applyMatchedProperties(StyleResolverState& state, const Matc

updateFont(state);

// Many properties depend on the font. If it changes we just apply all properties.

- if (cachedMatchedProperties && cachedMatchedProperties->computedStyle->fontDescription() != state.style()->fontDescription())

+ if (cachedMatchedProperties && cachedMatchedProperties->computedStyle->getFontDescription() != state.style()->getFontDescription())

applyInheritedOnly = false;

// Now do the normal priority UA properties.