third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp - Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

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 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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/animation/EffectInput.cpp ('k') | third_party/WebKit/Source/core/css/DragUpdateTest.cpp » ('j') | third_party/WebKit/Source/core/testing/Internals.idl » ('J')
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 f45c33fef7fa1a013d9bb50431952d430906d19c..b6f39ab83f61c7ae8fd85d549850142d7f8e12eb 100644

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

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

@@ -404,7 +404,7 @@ CSSValue* CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword() co

if (!m_node)

return nullptr;

- m_node->document().updateLayoutIgnorePendingStylesheets();

+ m_node->document().updateStyleAndLayoutIgnorePendingStylesheets();

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

if (!style)

@@ -538,7 +538,7 @@ CSSValue* CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propert

Document& document = styledNode->document();

- document.updateLayoutTreeForNode(styledNode);

+ document.updateStyleAndLayoutTreeForNode(styledNode);

// The style recalc could have caused the styled node to be discarded or replaced

// if it was a PseudoElement so we need to update it.

@@ -552,7 +552,7 @@ CSSValue* CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propert

|| (document.ownerElement() && document.ensureStyleResolver().hasViewportDependentMediaQueries());

if (forceFullLayout) {

- document.updateLayoutIgnorePendingStylesheetsForNode(styledNode);

+ document.updateStyleAndLayoutIgnorePendingStylesheetsForNode(styledNode);

styledNode = this->styledNode();

style = computeComputedStyle();

layoutObject = styledNode->layoutObject();

@@ -596,7 +596,7 @@ String CSSComputedStyleDeclaration::item(unsigned i) const

bool CSSComputedStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID, const CSSValue* propertyValue) const

{

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

- m_node->document().updateLayoutIgnorePendingStylesheets();

+ m_node->document().updateStyleAndLayoutIgnorePendingStylesheets();

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

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

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