| 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
|
|
|