Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: sky/engine/core/css/CSSComputedStyleDeclaration.cpp

Issue 834693007: Remove the remaining parts of ignorePendingStylesheets and placeholder styles. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove comment. Created 5 years, 11 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 | « no previous file | sky/engine/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/sky/engine/core/css/CSSComputedStyleDeclaration.cpp b/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
index b3d6854a08ce82d1284c045c93d3041076ba9bd3..dcf2ae55013e73e1317603422ca689f2a4ded1c2 100644
--- a/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
+++ b/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
@@ -954,7 +954,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringK
if (!m_node)
return nullptr;
- m_node->document().updateLayoutIgnorePendingStylesheets();
+ m_node->document().updateLayout();
RefPtr<RenderStyle> style = m_node->computedStyle(m_pseudoElementSpecifier);
if (!style)
@@ -1275,7 +1275,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
bool forceFullLayout = isLayoutDependent(propertyID, style, renderer) || m_node->isInShadowTree();
if (forceFullLayout) {
- document.updateLayoutIgnorePendingStylesheets();
+ document.updateLayout();
style = computeRenderStyle(propertyID);
renderer = m_node->renderer();
}
@@ -2259,7 +2259,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().updateLayout();
RenderStyle* style = m_node->computedStyle(m_pseudoElementSpecifier);
if (style && style->fontDescription().keywordSize()) {
CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(style->fontDescription().keywordSize());
« no previous file with comments | « no previous file | sky/engine/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698