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/core/page/Settings.h

Issue 22747002: setViewportEnabled on InternalSettings (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Mac compile issue: removed unused member variable Created 7 years, 4 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
« no previous file with comments | « LayoutTests/fast/viewport/viewport-enabled-expected.txt ('k') | Source/core/page/Settings.cpp » ('j') | 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) 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 static void setUsesOverlayScrollbars(bool flag); 145 static void setUsesOverlayScrollbars(bool flag);
146 static bool usesOverlayScrollbars(); 146 static bool usesOverlayScrollbars();
147 147
148 void setTouchEventEmulationEnabled(bool enabled) { m_touchEventEmulationEnab led = enabled; } 148 void setTouchEventEmulationEnabled(bool enabled) { m_touchEventEmulationEnab led = enabled; }
149 bool isTouchEventEmulationEnabled() const { return m_touchEventEmulationEnab led; } 149 bool isTouchEventEmulationEnabled() const { return m_touchEventEmulationEnab led; }
150 150
151 void setOpenGLMultisamplingEnabled(bool flag); 151 void setOpenGLMultisamplingEnabled(bool flag);
152 bool openGLMultisamplingEnabled(); 152 bool openGLMultisamplingEnabled();
153 153
154 void setViewportEnabled(bool);
155 bool viewportEnabled() const { return m_viewportEnabled; }
156
154 // FIXME: This is a temporary flag and should be removed once accelerated 157 // FIXME: This is a temporary flag and should be removed once accelerated
155 // overflow scroll is ready (crbug.com/254111). 158 // overflow scroll is ready (crbug.com/254111).
156 void setCompositorDrivenAcceleratedScrollingEnabled(bool enabled) { m_compos itorDrivenAcceleratedScrollingEnabled = enabled; } 159 void setCompositorDrivenAcceleratedScrollingEnabled(bool enabled) { m_compos itorDrivenAcceleratedScrollingEnabled = enabled; }
157 bool isCompositorDrivenAcceleratedScrollingEnabled() const { return m_compos itorDrivenAcceleratedScrollingEnabled; } 160 bool isCompositorDrivenAcceleratedScrollingEnabled() const { return m_compos itorDrivenAcceleratedScrollingEnabled; }
158 161
159 private: 162 private:
160 explicit Settings(Page*); 163 explicit Settings(Page*);
161 164
162 Page* m_page; 165 Page* m_page;
163 166
(...skipping 18 matching lines...) Expand all
182 bool m_loadsImagesAutomatically : 1; 185 bool m_loadsImagesAutomatically : 1;
183 bool m_areImagesEnabled : 1; 186 bool m_areImagesEnabled : 1;
184 bool m_arePluginsEnabled : 1; 187 bool m_arePluginsEnabled : 1;
185 bool m_isScriptEnabled : 1; 188 bool m_isScriptEnabled : 1;
186 bool m_isCSSCustomFilterEnabled : 1; 189 bool m_isCSSCustomFilterEnabled : 1;
187 bool m_cssStickyPositionEnabled : 1; 190 bool m_cssStickyPositionEnabled : 1;
188 bool m_dnsPrefetchingEnabled : 1; 191 bool m_dnsPrefetchingEnabled : 1;
189 192
190 bool m_touchEventEmulationEnabled : 1; 193 bool m_touchEventEmulationEnabled : 1;
191 bool m_openGLMultisamplingEnabled : 1; 194 bool m_openGLMultisamplingEnabled : 1;
195 bool m_viewportEnabled : 1;
192 196
193 // FIXME: This is a temporary flag and should be removed once accelerated 197 // FIXME: This is a temporary flag and should be removed once accelerated
194 // overflow scroll is ready (crbug.com/254111). 198 // overflow scroll is ready (crbug.com/254111).
195 bool m_compositorDrivenAcceleratedScrollingEnabled : 1; 199 bool m_compositorDrivenAcceleratedScrollingEnabled : 1;
196 200
197 Timer<Settings> m_setImageLoadingSettingsTimer; 201 Timer<Settings> m_setImageLoadingSettingsTimer;
198 void imageLoadingSettingsTimerFired(Timer<Settings>*); 202 void imageLoadingSettingsTimerFired(Timer<Settings>*);
199 203
200 static bool gMockScrollbarsEnabled; 204 static bool gMockScrollbarsEnabled;
201 static bool gUsesOverlayScrollbars; 205 static bool gUsesOverlayScrollbars;
202 }; 206 };
203 207
204 } // namespace WebCore 208 } // namespace WebCore
205 209
206 #endif // Settings_h 210 #endif // Settings_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/viewport/viewport-enabled-expected.txt ('k') | Source/core/page/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698