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

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

Issue 40423003: Experimental viewport meta tag support for desktop, Blink-side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase again Created 7 years, 1 month 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 | « Source/core/dom/Document.cpp ('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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
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); 154 void setViewportEnabled(bool);
155 bool viewportEnabled() const { return m_viewportEnabled; } 155 bool viewportEnabled() const { return m_viewportEnabled; }
156 156
157 void setViewportMetaEnabled(bool);
158 bool viewportMetaEnabled() const
159 {
160 // FIXME: Remove and uncomment once chromium side changes land.
161 return true;
162 // return m_viewportMetaEnabled;
163 }
164
157 // FIXME: This is a temporary flag and should be removed once accelerated 165 // FIXME: This is a temporary flag and should be removed once accelerated
158 // overflow scroll is ready (crbug.com/254111). 166 // overflow scroll is ready (crbug.com/254111).
159 void setCompositorDrivenAcceleratedScrollingEnabled(bool enabled) { m_compos itorDrivenAcceleratedScrollingEnabled = enabled; } 167 void setCompositorDrivenAcceleratedScrollingEnabled(bool enabled) { m_compos itorDrivenAcceleratedScrollingEnabled = enabled; }
160 bool isCompositorDrivenAcceleratedScrollingEnabled() const { return m_compos itorDrivenAcceleratedScrollingEnabled; } 168 bool isCompositorDrivenAcceleratedScrollingEnabled() const { return m_compos itorDrivenAcceleratedScrollingEnabled; }
161 169
162 private: 170 private:
163 explicit Settings(Page*); 171 explicit Settings(Page*);
164 172
165 Page* m_page; 173 Page* m_page;
166 174
(...skipping 18 matching lines...) Expand all
185 bool m_isJavaEnabled : 1; 193 bool m_isJavaEnabled : 1;
186 bool m_loadsImagesAutomatically : 1; 194 bool m_loadsImagesAutomatically : 1;
187 bool m_areImagesEnabled : 1; 195 bool m_areImagesEnabled : 1;
188 bool m_arePluginsEnabled : 1; 196 bool m_arePluginsEnabled : 1;
189 bool m_isScriptEnabled : 1; 197 bool m_isScriptEnabled : 1;
190 bool m_dnsPrefetchingEnabled : 1; 198 bool m_dnsPrefetchingEnabled : 1;
191 199
192 bool m_touchEventEmulationEnabled : 1; 200 bool m_touchEventEmulationEnabled : 1;
193 bool m_openGLMultisamplingEnabled : 1; 201 bool m_openGLMultisamplingEnabled : 1;
194 bool m_viewportEnabled : 1; 202 bool m_viewportEnabled : 1;
203 bool m_viewportMetaEnabled : 1;
195 204
196 // FIXME: This is a temporary flag and should be removed once accelerated 205 // FIXME: This is a temporary flag and should be removed once accelerated
197 // overflow scroll is ready (crbug.com/254111). 206 // overflow scroll is ready (crbug.com/254111).
198 bool m_compositorDrivenAcceleratedScrollingEnabled : 1; 207 bool m_compositorDrivenAcceleratedScrollingEnabled : 1;
199 208
200 Timer<Settings> m_setImageLoadingSettingsTimer; 209 Timer<Settings> m_setImageLoadingSettingsTimer;
201 void imageLoadingSettingsTimerFired(Timer<Settings>*); 210 void imageLoadingSettingsTimerFired(Timer<Settings>*);
202 void recalculateTextAutosizingMultipliers(); 211 void recalculateTextAutosizingMultipliers();
203 }; 212 };
204 213
205 } // namespace WebCore 214 } // namespace WebCore
206 215
207 #endif // Settings_h 216 #endif // Settings_h
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/page/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698