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

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

Issue 157853002: Revert of Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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 | 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 , m_clobberUserAgentInitialScaleQuirk(false) 56 , m_clobberUserAgentInitialScaleQuirk(false)
57 , m_pinchOverlayScrollbarThickness(0) 57 , m_pinchOverlayScrollbarThickness(0)
58 , m_mainFrameResizesAreOrientationChanges(false) 58 , m_mainFrameResizesAreOrientationChanges(false)
59 { 59 {
60 ASSERT(settings); 60 ASSERT(settings);
61 } 61 }
62 62
63 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript) 63 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript)
64 { 64 {
65 m_settings->genericFontFamilySettings().setStandard(font, script); 65 m_settings->genericFontFamilySettings().setStandard(font, script);
66 m_settings->notifyGenericFontFamilyChange();
67 } 66 }
68 67
69 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt) 68 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt)
70 { 69 {
71 m_settings->genericFontFamilySettings().setFixed(font, script); 70 m_settings->genericFontFamilySettings().setFixed(font, script);
72 m_settings->notifyGenericFontFamilyChange();
73 } 71 }
74 72
75 void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode scri pt) 73 void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode scri pt)
76 { 74 {
77 m_settings->genericFontFamilySettings().setSerif(font, script); 75 m_settings->genericFontFamilySettings().setSerif(font, script);
78 m_settings->notifyGenericFontFamilyChange();
79 } 76 }
80 77
81 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script) 78 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
82 { 79 {
83 m_settings->genericFontFamilySettings().setSansSerif(font, script); 80 m_settings->genericFontFamilySettings().setSansSerif(font, script);
84 m_settings->notifyGenericFontFamilyChange();
85 } 81 }
86 82
87 void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode sc ript) 83 void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode sc ript)
88 { 84 {
89 m_settings->genericFontFamilySettings().setCursive(font, script); 85 m_settings->genericFontFamilySettings().setCursive(font, script);
90 m_settings->notifyGenericFontFamilyChange();
91 } 86 }
92 87
93 void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode sc ript) 88 void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode sc ript)
94 { 89 {
95 m_settings->genericFontFamilySettings().setFantasy(font, script); 90 m_settings->genericFontFamilySettings().setFantasy(font, script);
96 m_settings->notifyGenericFontFamilyChange();
97 } 91 }
98 92
99 void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script) 93 void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script)
100 { 94 {
101 m_settings->genericFontFamilySettings().setPictograph(font, script); 95 m_settings->genericFontFamilySettings().setPictograph(font, script);
102 m_settings->notifyGenericFontFamilyChange();
103 } 96 }
104 97
105 void WebSettingsImpl::setDefaultFontSize(int size) 98 void WebSettingsImpl::setDefaultFontSize(int size)
106 { 99 {
107 m_settings->setDefaultFontSize(size); 100 m_settings->setDefaultFontSize(size);
108 } 101 }
109 102
110 void WebSettingsImpl::setDefaultFixedFontSize(int size) 103 void WebSettingsImpl::setDefaultFixedFontSize(int size)
111 { 104 {
112 m_settings->setDefaultFixedFontSize(size); 105 m_settings->setDefaultFixedFontSize(size);
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 { 744 {
752 m_settings->setUseSolidColorScrollbars(enabled); 745 m_settings->setUseSolidColorScrollbars(enabled);
753 } 746 }
754 747
755 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled) 748 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled)
756 { 749 {
757 m_mainFrameResizesAreOrientationChanges = enabled; 750 m_mainFrameResizesAreOrientationChanges = enabled;
758 } 751 }
759 752
760 } // namespace blink 753 } // 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