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

Side by Side Diff: Source/platform/mac/ThemeMac.h

Issue 1299653004: Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." (branch 248 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@2485
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/platform/fonts/mac/FontFamilyMatcherMacTest.mm ('k') | Source/platform/mac/ThemeMac.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 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ThemeMac_h 26 #ifndef ThemeMac_h
27 #define ThemeMac_h 27 #define ThemeMac_h
28 28
29 #include "platform/Theme.h" 29 #include "platform/Theme.h"
30 30
31 @interface NSFont(WebCoreTheme)
32 - (NSString*)webCoreFamilyName;
33 @end
34
31 namespace blink { 35 namespace blink {
32 36
33 class ThemeMac : public Theme { 37 class ThemeMac : public Theme {
34 public: 38 public:
35 ThemeMac() {} 39 ThemeMac() {}
36 ~ThemeMac() override {} 40 ~ThemeMac() override {}
37 41
38 virtual int baselinePositionAdjustment(ControlPart) const; 42 virtual int baselinePositionAdjustment(ControlPart) const;
39 43
40 virtual FontDescription controlFont(ControlPart, const FontDescription&, flo at zoomFactor) const; 44 virtual FontDescription controlFont(ControlPart, const FontDescription&, flo at zoomFactor) const;
(...skipping 25 matching lines...) Expand all
66 // drawWithFrameDrawsFocusRing() returns true (otherwise, the focus ring's 70 // drawWithFrameDrawsFocusRing() returns true (otherwise, the focus ring's
67 // bounds could be accurately computed with -[NSCell focusRingMaskBoundsForF rame:inView:]). 71 // bounds could be accurately computed with -[NSCell focusRingMaskBoundsForF rame:inView:]).
68 static PLATFORM_EXPORT IntRect inflateRectForFocusRing(const IntRect&); 72 static PLATFORM_EXPORT IntRect inflateRectForFocusRing(const IntRect&);
69 73
70 static PLATFORM_EXPORT bool drawWithFrameDrawsFocusRing(); 74 static PLATFORM_EXPORT bool drawWithFrameDrawsFocusRing();
71 }; 75 };
72 76
73 } // namespace blink 77 } // namespace blink
74 78
75 #endif // ThemeMac_h 79 #endif // ThemeMac_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm ('k') | Source/platform/mac/ThemeMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698