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

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

Issue 686013002: content: Enable 1-copy rasterizer on all platforms but Android and MacOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: keep disable-zero-copy in histograms.xml Created 6 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 | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 #if defined(USE_AURA) || defined(OS_LINUX) 298 #if defined(USE_AURA) || defined(OS_LINUX)
299 const Experiment::Choice kOverlayScrollbarChoices[] = { 299 const Experiment::Choice kOverlayScrollbarChoices[] = {
300 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 300 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
301 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 301 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
302 switches::kEnableOverlayScrollbar, ""}, 302 switches::kEnableOverlayScrollbar, ""},
303 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 303 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
304 switches::kDisableOverlayScrollbar, ""} 304 switches::kDisableOverlayScrollbar, ""}
305 }; 305 };
306 #endif 306 #endif
307 307
308 const Experiment::Choice kZeroCopyChoices[] = { 308 const Experiment::Choice kOneCopyChoices[] = {
309 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 309 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
310 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 310 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
311 switches::kEnableZeroCopy, ""}, 311 switches::kEnableOneCopy, ""},
312 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 312 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
313 switches::kDisableZeroCopy, ""} 313 switches::kDisableOneCopy, ""}
314 }; 314 };
315 315
316 #if defined(OS_ANDROID) 316 #if defined(OS_ANDROID)
317 const Experiment::Choice kZeroSuggestExperimentsChoices[] = { 317 const Experiment::Choice kZeroSuggestExperimentsChoices[] = {
318 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 318 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
319 { IDS_FLAGS_ZERO_SUGGEST_MOST_VISITED, 319 { IDS_FLAGS_ZERO_SUGGEST_MOST_VISITED,
320 switches::kEnableZeroSuggestMostVisited, ""}, 320 switches::kEnableZeroSuggestMostVisited, ""},
321 { IDS_FLAGS_ZERO_SUGGEST_MOST_VISITED_WITHOUT_SERP, 321 { IDS_FLAGS_ZERO_SUGGEST_MOST_VISITED_WITHOUT_SERP,
322 switches::kEnableZeroSuggestMostVisitedWithoutSerp, ""}, 322 switches::kEnableZeroSuggestMostVisitedWithoutSerp, ""},
323 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 323 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
(...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 kOsAndroid, 1543 kOsAndroid,
1544 // Java-only switch: ContentSwitches.ENABLE_ACCESSIBILITY_SCRIPT_INJECTION. 1544 // Java-only switch: ContentSwitches.ENABLE_ACCESSIBILITY_SCRIPT_INJECTION.
1545 SINGLE_VALUE_TYPE("enable-accessibility-script-injection") 1545 SINGLE_VALUE_TYPE("enable-accessibility-script-injection")
1546 }, 1546 },
1547 #endif 1547 #endif
1548 { 1548 {
1549 "enable-one-copy", 1549 "enable-one-copy",
1550 IDS_FLAGS_ONE_COPY_NAME, 1550 IDS_FLAGS_ONE_COPY_NAME,
1551 IDS_FLAGS_ONE_COPY_DESCRIPTION, 1551 IDS_FLAGS_ONE_COPY_DESCRIPTION,
1552 kOsAll, 1552 kOsAll,
1553 SINGLE_VALUE_TYPE(switches::kEnableOneCopy) 1553 MULTI_VALUE_TYPE(kOneCopyChoices)
1554 }, 1554 },
1555 { 1555 {
1556 "enable-zero-copy", 1556 "enable-zero-copy",
1557 IDS_FLAGS_ZERO_COPY_NAME, 1557 IDS_FLAGS_ZERO_COPY_NAME,
1558 IDS_FLAGS_ZERO_COPY_DESCRIPTION, 1558 IDS_FLAGS_ZERO_COPY_DESCRIPTION,
1559 kOsAll, 1559 kOsAll,
1560 MULTI_VALUE_TYPE(kZeroCopyChoices) 1560 SINGLE_VALUE_TYPE(switches::kEnableZeroCopy)
1561 }, 1561 },
1562 #if defined(OS_CHROMEOS) 1562 #if defined(OS_CHROMEOS)
1563 { 1563 {
1564 "enable-first-run-ui-transitions", 1564 "enable-first-run-ui-transitions",
1565 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, 1565 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME,
1566 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, 1566 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION,
1567 kOsCrOS, 1567 kOsCrOS,
1568 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) 1568 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)
1569 }, 1569 },
1570 #endif 1570 #endif
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
2608 } 2608 }
2609 2609
2610 const Experiment* GetExperiments(size_t* count) { 2610 const Experiment* GetExperiments(size_t* count) {
2611 *count = num_experiments; 2611 *count = num_experiments;
2612 return experiments; 2612 return experiments;
2613 } 2613 }
2614 2614
2615 } // namespace testing 2615 } // namespace testing
2616 2616
2617 } // namespace about_flags 2617 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698