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

Side by Side Diff: Source/web/WebSettingsImpl.cpp

Issue 100653002: Introduce GenericFontFamilySettings. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added missing PLATFORM_EXPORT Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/platform/fonts/GenericFontFamilySettings.cpp ('k') | no next file » | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 , m_viewportMetaNonUserScalableQuirk(false) 60 , m_viewportMetaNonUserScalableQuirk(false)
61 , m_clobberUserAgentInitialScaleQuirk(false) 61 , m_clobberUserAgentInitialScaleQuirk(false)
62 , m_pinchOverlayScrollbarThickness(0) 62 , m_pinchOverlayScrollbarThickness(0)
63 , m_mainFrameResizesAreOrientationChanges(false) 63 , m_mainFrameResizesAreOrientationChanges(false)
64 { 64 {
65 ASSERT(settings); 65 ASSERT(settings);
66 } 66 }
67 67
68 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript) 68 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript)
69 { 69 {
70 m_settings->setStandardFontFamily(font, script); 70 m_settings->genericFontFamilySettings().setStandard(font, script);
71 } 71 }
72 72
73 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt) 73 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt)
74 { 74 {
75 m_settings->setFixedFontFamily(font, script); 75 m_settings->genericFontFamilySettings().setFixed(font, script);
76 } 76 }
77 77
78 void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode scri pt) 78 void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode scri pt)
79 { 79 {
80 m_settings->setSerifFontFamily(font, script); 80 m_settings->genericFontFamilySettings().setSerif(font, script);
81 } 81 }
82 82
83 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script) 83 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
84 { 84 {
85 m_settings->setSansSerifFontFamily(font, script); 85 m_settings->genericFontFamilySettings().setSansSerif(font, script);
86 } 86 }
87 87
88 void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode sc ript) 88 void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode sc ript)
89 { 89 {
90 m_settings->setCursiveFontFamily(font, script); 90 m_settings->genericFontFamilySettings().setCursive(font, script);
91 } 91 }
92 92
93 void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode sc ript) 93 void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode sc ript)
94 { 94 {
95 m_settings->setFantasyFontFamily(font, script); 95 m_settings->genericFontFamilySettings().setFantasy(font, script);
96 } 96 }
97 97
98 void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script) 98 void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script)
99 { 99 {
100 m_settings->setPictographFontFamily(font, script); 100 m_settings->genericFontFamilySettings().setPictograph(font, script);
101 } 101 }
102 102
103 void WebSettingsImpl::setDefaultFontSize(int size) 103 void WebSettingsImpl::setDefaultFontSize(int size)
104 { 104 {
105 m_settings->setDefaultFontSize(size); 105 m_settings->setDefaultFontSize(size);
106 #if OS(WIN) 106 #if OS(WIN)
107 // RenderTheme is a singleton that needs to know the default font size to 107 // RenderTheme is a singleton that needs to know the default font size to
108 // draw some form controls. We let it know each time the size changes. 108 // draw some form controls. We let it know each time the size changes.
109 WebCore::RenderThemeChromiumWin::setDefaultFontSize(size); 109 WebCore::RenderThemeChromiumWin::setDefaultFontSize(size);
110 #endif 110 #endif
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 { 771 {
772 m_settings->setUseSolidColorScrollbars(enabled); 772 m_settings->setUseSolidColorScrollbars(enabled);
773 } 773 }
774 774
775 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled) 775 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled)
776 { 776 {
777 m_mainFrameResizesAreOrientationChanges = enabled; 777 m_mainFrameResizesAreOrientationChanges = enabled;
778 } 778 }
779 779
780 } // namespace blink 780 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/fonts/GenericFontFamilySettings.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698