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

Side by Side Diff: Source/core/layout/LayoutThemeMac.h

Issue 1292593003: Revert "Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." Br… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « Source/core/layout/LayoutTheme.h ('k') | Source/core/layout/LayoutThemeMac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of the theme implementation for form controls in WebCore. 2 * This file is part of the theme implementation for form controls in WebCore.
3 * 3 *
4 * Copyright (C) 2005 Apple Computer, Inc. 4 * Copyright (C) 2005 Apple Computer, Inc.
5 * Copyright (C) 2008, 2009 Google, Inc. 5 * Copyright (C) 2008, 2009 Google, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 Color platformInactiveListBoxSelectionForegroundColor() const override; 50 Color platformInactiveListBoxSelectionForegroundColor() const override;
51 Color platformFocusRingColor() const override; 51 Color platformFocusRingColor() const override;
52 52
53 ScrollbarControlSize scrollbarControlSizeForPart(ControlPart part) override { return part == ListboxPart ? SmallScrollbar : RegularScrollbar; } 53 ScrollbarControlSize scrollbarControlSizeForPart(ControlPart part) override { return part == ListboxPart ? SmallScrollbar : RegularScrollbar; }
54 54
55 void platformColorsDidChange() override; 55 void platformColorsDidChange() override;
56 56
57 // System fonts. 57 // System fonts.
58 void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, float& fon tSize, AtomicString& fontFamily) const override; 58 void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, float& fon tSize, AtomicString& fontFamily) const override;
59 59
60 bool needsHackForTextControlWithFontFamily(const AtomicString& family) const override;
61
60 int minimumMenuListSize(const ComputedStyle&) const override; 62 int minimumMenuListSize(const ComputedStyle&) const override;
61 63
62 void adjustSliderThumbSize(ComputedStyle&) const override; 64 void adjustSliderThumbSize(ComputedStyle&) const override;
63 65
64 IntSize sliderTickSize() const override; 66 IntSize sliderTickSize() const override;
65 int sliderTickOffsetFromTrackCenter() const override; 67 int sliderTickOffsetFromTrackCenter() const override;
66 68
67 int popupInternalPaddingLeft(const ComputedStyle&) const override; 69 int popupInternalPaddingLeft(const ComputedStyle&) const override;
68 int popupInternalPaddingRight(const ComputedStyle&) const override; 70 int popupInternalPaddingRight(const ComputedStyle&) const override;
69 int popupInternalPaddingTop(const ComputedStyle&) const override; 71 int popupInternalPaddingTop(const ComputedStyle&) const override;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 mutable HashMap<int, RGBA32> m_systemColorCache; 190 mutable HashMap<int, RGBA32> m_systemColorCache;
189 191
190 RetainPtr<LayoutThemeNotificationObserver> m_notificationObserver; 192 RetainPtr<LayoutThemeNotificationObserver> m_notificationObserver;
191 193
192 ThemePainterMac m_painter; 194 ThemePainterMac m_painter;
193 }; 195 };
194 196
195 } // namespace blink 197 } // namespace blink
196 198
197 #endif // LayoutThemeMac_h 199 #endif // LayoutThemeMac_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutTheme.h ('k') | Source/core/layout/LayoutThemeMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698