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

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: Fix fast/text/international/ regression 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 , m_clobberUserAgentInitialScaleQuirk(false) 60 , m_clobberUserAgentInitialScaleQuirk(false)
61 , m_pinchOverlayScrollbarThickness(0) 61 , m_pinchOverlayScrollbarThickness(0)
62 , m_mainFrameResizesAreOrientationChanges(false) 62 , m_mainFrameResizesAreOrientationChanges(false)
63 { 63 {
64 ASSERT(settings); 64 ASSERT(settings);
65 } 65 }
66 66
67 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript) 67 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript)
68 { 68 {
69 m_settings->genericFontFamilySettings().setStandard(font, script); 69 m_settings->genericFontFamilySettings().setStandard(font, script);
70 m_settings->notifyGenericFontFamilyChange();
dglazkov 2014/01/29 05:11:50 These WebSettingImpl functions are never called se
tasak 2014/01/29 10:13:43 I would like to confirm what you mean. As far as I
70 } 71 }
71 72
72 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt) 73 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt)
73 { 74 {
74 m_settings->genericFontFamilySettings().setFixed(font, script); 75 m_settings->genericFontFamilySettings().setFixed(font, script);
76 m_settings->notifyGenericFontFamilyChange();
75 } 77 }
76 78
77 void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode scri pt) 79 void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode scri pt)
78 { 80 {
79 m_settings->genericFontFamilySettings().setSerif(font, script); 81 m_settings->genericFontFamilySettings().setSerif(font, script);
82 m_settings->notifyGenericFontFamilyChange();
80 } 83 }
81 84
82 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script) 85 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
83 { 86 {
84 m_settings->genericFontFamilySettings().setSansSerif(font, script); 87 m_settings->genericFontFamilySettings().setSansSerif(font, script);
88 m_settings->notifyGenericFontFamilyChange();
85 } 89 }
86 90
87 void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode sc ript) 91 void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode sc ript)
88 { 92 {
89 m_settings->genericFontFamilySettings().setCursive(font, script); 93 m_settings->genericFontFamilySettings().setCursive(font, script);
94 m_settings->notifyGenericFontFamilyChange();
90 } 95 }
91 96
92 void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode sc ript) 97 void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode sc ript)
93 { 98 {
94 m_settings->genericFontFamilySettings().setFantasy(font, script); 99 m_settings->genericFontFamilySettings().setFantasy(font, script);
100 m_settings->notifyGenericFontFamilyChange();
95 } 101 }
96 102
97 void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script) 103 void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script)
98 { 104 {
99 m_settings->genericFontFamilySettings().setPictograph(font, script); 105 m_settings->genericFontFamilySettings().setPictograph(font, script);
106 m_settings->notifyGenericFontFamilyChange();
100 } 107 }
101 108
102 void WebSettingsImpl::setDefaultFontSize(int size) 109 void WebSettingsImpl::setDefaultFontSize(int size)
103 { 110 {
104 m_settings->setDefaultFontSize(size); 111 m_settings->setDefaultFontSize(size);
105 #if OS(WIN) 112 #if OS(WIN)
106 // RenderTheme is a singleton that needs to know the default font size to 113 // RenderTheme is a singleton that needs to know the default font size to
107 // draw some form controls. We let it know each time the size changes. 114 // draw some form controls. We let it know each time the size changes.
108 WebCore::RenderThemeChromiumWin::setDefaultFontSize(size); 115 WebCore::RenderThemeChromiumWin::setDefaultFontSize(size);
109 #endif 116 #endif
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 { 760 {
754 m_settings->setUseSolidColorScrollbars(enabled); 761 m_settings->setUseSolidColorScrollbars(enabled);
755 } 762 }
756 763
757 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled) 764 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled)
758 { 765 {
759 m_mainFrameResizesAreOrientationChanges = enabled; 766 m_mainFrameResizesAreOrientationChanges = enabled;
760 } 767 }
761 768
762 } // namespace blink 769 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698