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

Unified Diff: Source/core/layout/LayoutThemeMac.mm

Issue 1172793005: Fon't drop the FontSelector in LayoutThemeMac::setFontFromControlSize. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutThemeMac.mm
diff --git a/Source/core/layout/LayoutThemeMac.mm b/Source/core/layout/LayoutThemeMac.mm
index 3f09121fe1bf322e9b1f45181793c57d71626253..4f6510d2b7db2e7f41d076be7bfe5853ad9f43df 100644
--- a/Source/core/layout/LayoutThemeMac.mm
+++ b/Source/core/layout/LayoutThemeMac.mm
@@ -599,8 +599,10 @@ void LayoutThemeMac::setFontFromControlSize(ComputedStyle& style, NSControlSize
// Reset line height.
style.setLineHeight(ComputedStyle::initialLineHeight());
+ // TODO(esprehn): The fontSelector manual management is buggy and error prone.
+ FontSelector* fontSelector = style.font().fontSelector();
if (style.setFontDescription(fontDescription))
- style.font().update(nullptr);
+ style.font().update(fontSelector);
}
NSControlSize LayoutThemeMac::controlSizeForSystemFont(const ComputedStyle& style) const
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698