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

Side by Side Diff: Source/core/frame/Settings.h

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) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 EditableLinkLiveWhenNotFocused, 48 EditableLinkLiveWhenNotFocused,
49 EditableLinkNeverLive 49 EditableLinkNeverLive
50 }; 50 };
51 51
52 class Settings { 52 class Settings {
53 WTF_MAKE_NONCOPYABLE(Settings); WTF_MAKE_FAST_ALLOCATED; 53 WTF_MAKE_NONCOPYABLE(Settings); WTF_MAKE_FAST_ALLOCATED;
54 public: 54 public:
55 static PassOwnPtr<Settings> create(); 55 static PassOwnPtr<Settings> create();
56 56
57 GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFon tFamilySettings; } 57 GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFon tFamilySettings; }
58 void notifyGenericFontFamilyChange() { invalidate(SettingsDelegate::FontFami lyChange); }
dglazkov 2014/01/29 05:11:50 I was hoping to avoid this function altogether. Do
tasak 2014/01/29 10:13:43 Looking at some layout test or WebSettings, Generi
58 59
59 void setTextAutosizingEnabled(bool); 60 void setTextAutosizingEnabled(bool);
60 bool textAutosizingEnabled() const; 61 bool textAutosizingEnabled() const;
61 62
62 // Compensates for poor text legibility on mobile devices. This value is 63 // Compensates for poor text legibility on mobile devices. This value is
63 // multiplied by the font scale factor when performing text autosizing of 64 // multiplied by the font scale factor when performing text autosizing of
64 // websites that do not set an explicit viewport description. 65 // websites that do not set an explicit viewport description.
65 void setDeviceScaleAdjustment(float); 66 void setDeviceScaleAdjustment(float);
66 float deviceScaleAdjustment() const; 67 float deviceScaleAdjustment() const;
67 68
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 107
107 SETTINGS_MEMBER_VARIABLES 108 SETTINGS_MEMBER_VARIABLES
108 109
109 bool m_isScriptEnabled : 1; 110 bool m_isScriptEnabled : 1;
110 bool m_openGLMultisamplingEnabled : 1; 111 bool m_openGLMultisamplingEnabled : 1;
111 }; 112 };
112 113
113 } // namespace WebCore 114 } // namespace WebCore
114 115
115 #endif // Settings_h 116 #endif // Settings_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698