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

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

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

Powered by Google App Engine
This is Rietveld 408576698