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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 447863003: Using experiments to activate the DisplayList2DCanvas optimization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase master + Fixing AboutFlagsHistogramTest.CheckHistograms test Created 6 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 | « no previous file | chrome/browser/chrome_browser_field_trials.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 first = std::find(cmdline.argv().begin(), cmdline.argv().end(), 132 first = std::find(cmdline.argv().begin(), cmdline.argv().end(),
133 GetSwitchString(chromeos::switches::kPolicySwitchesBegin)); 133 GetSwitchString(chromeos::switches::kPolicySwitchesBegin));
134 last = std::find(cmdline.argv().begin(), cmdline.argv().end(), 134 last = std::find(cmdline.argv().begin(), cmdline.argv().end(),
135 GetSwitchString(chromeos::switches::kPolicySwitchesEnd)); 135 GetSwitchString(chromeos::switches::kPolicySwitchesEnd));
136 if (first != cmdline.argv().end() && last != cmdline.argv().end()) 136 if (first != cmdline.argv().end() && last != cmdline.argv().end())
137 flags.insert(first + 1, last); 137 flags.insert(first + 1, last);
138 #endif 138 #endif
139 return flags; 139 return flags;
140 } 140 }
141 141
142 const Experiment::Choice kEnableDisplayList2DcanvasChoices[] = {
143 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
144 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
145 switches::kEnableDisplayList2dCanvas, ""},
146 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
147 switches::kDisableDisplayList2dCanvas, ""},
148 };
149
142 const Experiment::Choice kEnableCompositingForTransitionChoices[] = { 150 const Experiment::Choice kEnableCompositingForTransitionChoices[] = {
143 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 151 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
144 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 152 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
145 switches::kEnableCompositingForTransition, ""}, 153 switches::kEnableCompositingForTransition, ""},
146 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 154 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
147 switches::kDisableCompositingForTransition, ""}, 155 switches::kDisableCompositingForTransition, ""},
148 }; 156 };
149 157
150 const Experiment::Choice kTouchEventsChoices[] = { 158 const Experiment::Choice kTouchEventsChoices[] = {
151 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, 159 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME, 577 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME,
570 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION, 578 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION,
571 kOsAll, 579 kOsAll,
572 SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas) 580 SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)
573 }, 581 },
574 { 582 {
575 "enable-display-list-2d-canvas", 583 "enable-display-list-2d-canvas",
576 IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_NAME, 584 IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_NAME,
577 IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_DESCRIPTION, 585 IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_DESCRIPTION,
578 kOsAll, 586 kOsAll,
579 SINGLE_VALUE_TYPE(switches::kEnableDisplayList2dCanvas) 587 MULTI_VALUE_TYPE(kEnableDisplayList2DcanvasChoices)
580 }, 588 },
581 { 589 {
582 "composited-layer-borders", 590 "composited-layer-borders",
583 IDS_FLAGS_COMPOSITED_LAYER_BORDERS, 591 IDS_FLAGS_COMPOSITED_LAYER_BORDERS,
584 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, 592 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION,
585 kOsAll, 593 kOsAll,
586 SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders) 594 SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)
587 }, 595 },
588 { 596 {
589 "show-fps-counter", 597 "show-fps-counter",
(...skipping 1896 matching lines...) Expand 10 before | Expand all | Expand 10 after
2486 } 2494 }
2487 2495
2488 const Experiment* GetExperiments(size_t* count) { 2496 const Experiment* GetExperiments(size_t* count) {
2489 *count = num_experiments; 2497 *count = num_experiments;
2490 return experiments; 2498 return experiments;
2491 } 2499 }
2492 2500
2493 } // namespace testing 2501 } // namespace testing
2494 2502
2495 } // namespace about_flags 2503 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_field_trials.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698