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

Side by Side Diff: content/public/common/content_switches.cc

Issue 10532058: added gpu_benchmarking_extension boilerplate and hooked it up to a new switch. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed merge conflict Created 8 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/common/content_switches.h" 5 #include "content/public/common/content_switches.h"
6 6
7 namespace switches { 7 namespace switches {
8 8
9 // By default, file:// URIs cannot read other file:// URIs. This is an 9 // By default, file:// URIs cannot read other file:// URIs. This is an
10 // override for developers who need the old behavior for testing. 10 // override for developers who need the old behavior for testing.
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 271
272 // Enable the JavaScript Full Screen API. 272 // Enable the JavaScript Full Screen API.
273 const char kDisableFullScreen[] = "disable-fullscreen"; 273 const char kDisableFullScreen[] = "disable-fullscreen";
274 274
275 // Enable the JavaScript Pointer Lock API. 275 // Enable the JavaScript Pointer Lock API.
276 const char kEnablePointerLock[] = "enable-pointer-lock"; 276 const char kEnablePointerLock[] = "enable-pointer-lock";
277 277
278 // Enable the Gamepad API 278 // Enable the Gamepad API
279 const char kEnableGamepad[] = "enable-gamepad"; 279 const char kEnableGamepad[] = "enable-gamepad";
280 280
281 // Enables the GPU benchmarking extension
282 const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking";
283
281 // Force logging to be enabled. Logging is disabled by default in release 284 // Force logging to be enabled. Logging is disabled by default in release
282 // builds. 285 // builds.
283 const char kEnableLogging[] = "enable-logging"; 286 const char kEnableLogging[] = "enable-logging";
284 287
285 // Enables Media Source API on <audio>/<video> elements. 288 // Enables Media Source API on <audio>/<video> elements.
286 const char kEnableMediaSource[] = "enable-media-source"; 289 const char kEnableMediaSource[] = "enable-media-source";
287 290
288 // Enable media stream in WebKit. 291 // Enable media stream in WebKit.
289 // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#mediastr eam 292 // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#mediastr eam
290 const char kEnablePeerConnection[] = "enable-peer-connection"; 293 const char kEnablePeerConnection[] = "enable-peer-connection";
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 const char kDefaultTileWidth[] = "default-tile-width"; 670 const char kDefaultTileWidth[] = "default-tile-width";
668 const char kDefaultTileHeight[] = "default-tile-height"; 671 const char kDefaultTileHeight[] = "default-tile-height";
669 672
670 // Sets the width and height above which a composited layer will get tiled. 673 // Sets the width and height above which a composited layer will get tiled.
671 const char kMaxUntiledLayerWidth[] = "max-untiled-layer-width"; 674 const char kMaxUntiledLayerWidth[] = "max-untiled-layer-width";
672 const char kMaxUntiledLayerHeight[] = "max-untiled-layer-height"; 675 const char kMaxUntiledLayerHeight[] = "max-untiled-layer-height";
673 676
674 const char kFixedPositionCreatesStackingContext[] 677 const char kFixedPositionCreatesStackingContext[]
675 = "fixed-position-creates-stacking-context"; 678 = "fixed-position-creates-stacking-context";
676 } // namespace switches 679 } // namespace switches
OLDNEW
« no previous file with comments | « content/public/common/content_switches.h ('k') | content/renderer/gpu/gpu_benchmarking_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698