Source/WebKit/chromium/src/WebSettingsImpl.h - Issue 11862015: Merge 139356

Side by Side Diff: Source/WebKit/chromium/src/WebSettingsImpl.h

Issue 11862015: Merge 139356 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 11 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:

« no previous file with comments | « Source/WebKit/chromium/src/ChromeClientImpl.cpp ('k') | Source/WebKit/chromium/src/WebSettingsImpl.cpp » ('j') | no next file with comments »

OLD	NEW
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 154 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 virtual void setWebAudioEnabled(bool);	165 virtual void setWebAudioEnabled(bool);

166 virtual void setWebGLErrorsToConsoleEnabled(bool);	166 virtual void setWebGLErrorsToConsoleEnabled(bool);

167 virtual void setWebSecurityEnabled(bool);	167 virtual void setWebSecurityEnabled(bool);

168 virtual void setXSSAuditorEnabled(bool);	168 virtual void setXSSAuditorEnabled(bool);

169	169

170 bool showFPSCounter() const { return m_showFPSCounter; }	170 bool showFPSCounter() const { return m_showFPSCounter; }

171 bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }	171 bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }

172 bool showPaintRects() const { return m_showPaintRects; }	172 bool showPaintRects() const { return m_showPaintRects; }

173 bool renderVSyncEnabled() const { return m_renderVSyncEnabled; }	173 bool renderVSyncEnabled() const { return m_renderVSyncEnabled; }

174 bool lowLatencyRenderingEnabled() const { return m_lowLatencyRenderingEnable d; }	174 bool lowLatencyRenderingEnabled() const { return m_lowLatencyRenderingEnable d; }

175 bool applyDeviceScaleFactorInCompositor() const { return m_applyDeviceScaleF actorInCompositor; }	175 bool applyDeviceScaleFactorInCompositor() const;

176 bool applyPageScaleFactorInCompositor() const;	176 bool applyPageScaleFactorInCompositor() const;

177 bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNod eToLegibleScale; }	177 bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNod eToLegibleScale; }

178 bool gestureTapHighlightEnabled() const { return m_gestureTapHighlightEnable d; }	178 bool gestureTapHighlightEnabled() const { return m_gestureTapHighlightEnable d; }

179 bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }	179 bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }

180 bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }	180 bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }

181 bool acceleratedAnimationEnabled() const { return m_acceleratedAnimationEnab led; }	181 bool acceleratedAnimationEnabled() const { return m_acceleratedAnimationEnab led; }

182 WebSize defaultTileSize() const { return m_defaultTileSize; }	182 WebSize defaultTileSize() const { return m_defaultTileSize; }

183 WebSize maxUntiledLayerSize() const { return m_maxUntiledLayerSize; }	183 WebSize maxUntiledLayerSize() const { return m_maxUntiledLayerSize; }

184	184

185 private:	185 private:

186 WebCore::Settings* m_settings;	186 WebCore::Settings* m_settings;

187 bool m_showFPSCounter;	187 bool m_showFPSCounter;

188 bool m_showPlatformLayerTree;	188 bool m_showPlatformLayerTree;

189 bool m_showPaintRects;	189 bool m_showPaintRects;

190 bool m_renderVSyncEnabled;	190 bool m_renderVSyncEnabled;

191 bool m_lowLatencyRenderingEnabled;	191 bool m_lowLatencyRenderingEnabled;

192 bool m_viewportEnabled;	192 bool m_viewportEnabled;

193 bool m_applyDeviceScaleFactorInCompositor;

194 bool m_gestureTapHighlightEnabled;	193 bool m_gestureTapHighlightEnabled;

195 bool m_autoZoomFocusedNodeToLegibleScale;	194 bool m_autoZoomFocusedNodeToLegibleScale;

196 bool m_deferredImageDecodingEnabled;	195 bool m_deferredImageDecodingEnabled;

197 bool m_doubleTapToZoomEnabled;	196 bool m_doubleTapToZoomEnabled;

198 bool m_perTilePaintingEnabled;	197 bool m_perTilePaintingEnabled;

199 bool m_acceleratedAnimationEnabled;	198 bool m_acceleratedAnimationEnabled;

200 WebSize m_defaultTileSize;	199 WebSize m_defaultTileSize;

201 WebSize m_maxUntiledLayerSize;	200 WebSize m_maxUntiledLayerSize;

202 };	201 };

203	202

204 } // namespace WebKit	203 } // namespace WebKit

205	204

206 #endif	205 #endif

OLD	NEW