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

Unified Diff: Source/core/css/resolver/StyleResolverState.h

Issue 715633006: Remove FontDescriptionChangeScope, and let FontBuilder partially apply values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix size/family ordering. Created 6 years 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
Index: Source/core/css/resolver/StyleResolverState.h
diff --git a/Source/core/css/resolver/StyleResolverState.h b/Source/core/css/resolver/StyleResolverState.h
index dcd0cc9c9cb9ba48129af2af77131a761ea8dd99..9234e7b8ad34e3422077ba6a240194b6b38af41b 100644
--- a/Source/core/css/resolver/StyleResolverState.h
+++ b/Source/core/css/resolver/StyleResolverState.h
@@ -66,7 +66,6 @@ public:
// FIXME: Improve RAII of StyleResolverState to remove this function.
m_style = style;
m_cssToLengthConversionData = CSSToLengthConversionData(m_style.get(), rootElementStyle(), document().renderView(), m_style->effectiveZoom());
- m_fontBuilder.setFontDescription(m_style->fontDescription());
}
const RenderStyle* style() const { return m_style.get(); }
RenderStyle* style() { return m_style.get(); }
@@ -127,10 +126,10 @@ public:
// want to design a better wrapper around RenderStyle for tracking these mutations
// and separate it from StyleResolverState.
const FontDescription& parentFontDescription() { return m_parentStyle->fontDescription(); }
- void setZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setZoom(f)); }
- void setEffectiveZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setEffectiveZoom(f)); }
- void setWritingMode(WritingMode writingMode) { m_fontBuilder.didChangeFontParameters(m_style->setWritingMode(writingMode)); }
- void setTextOrientation(TextOrientation textOrientation) { m_fontBuilder.didChangeFontParameters(m_style->setTextOrientation(textOrientation)); }
+ void setZoom(float f) { m_fontBuilder.didChangeEffectiveZoom(m_style->setZoom(f)); }
+ void setEffectiveZoom(float f) { m_fontBuilder.didChangeEffectiveZoom(m_style->setEffectiveZoom(f)); }
+ void setWritingMode(WritingMode writingMode) { m_fontBuilder.didChangeWritingMode(m_style->setWritingMode(writingMode)); }
+ void setTextOrientation(TextOrientation textOrientation) { m_fontBuilder.didChangeTextOrientation(m_style->setTextOrientation(textOrientation)); }
private:
ElementResolveContext m_elementContext;

Powered by Google App Engine
This is Rietveld 408576698