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

Unified Diff: gpu/config/gpu_util.cc

Issue 2695883003: Change uses of base::JoinString to pass StringPieces where possible. (Closed)
Patch Set: Fix android_webview compilation (and made FeatureList::SplitFeatureListString take StringPiece). Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: gpu/config/gpu_util.cc
diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
index a305c29698a9baa8e1a72d17c3427712ccf81de0..0d37c828ea557b9dea176b4c7f97cf4602b9765f 100644
--- a/gpu/config/gpu_util.cc
+++ b/gpu/config/gpu_util.cc
@@ -10,6 +10,7 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/sys_info.h"
@@ -105,23 +106,28 @@ void ApplyGpuDriverBugWorkarounds(const GPUInfo& gpu_info,
IntSetToString(workarounds));
}
- std::set<std::string> disabled_extensions;
std::vector<std::string> buglist_disabled_extensions =
list->GetDisabledExtensions();
- disabled_extensions.insert(buglist_disabled_extensions.begin(),
- buglist_disabled_extensions.end());
+ std::set<base::StringPiece> disabled_extensions(
+ buglist_disabled_extensions.begin(), buglist_disabled_extensions.end());
+ // Must be outside if statement to remain in scope (referenced by
+ // |disabled_extensions|).
+ std::string command_line_disable_gl_extensions;
if (command_line->HasSwitch(switches::kDisableGLExtensions)) {
- std::vector<std::string> existing_disabled_extensions = base::SplitString(
- command_line->GetSwitchValueASCII(switches::kDisableGLExtensions), " ",
- base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+ command_line_disable_gl_extensions =
+ command_line->GetSwitchValueASCII(switches::kDisableGLExtensions);
+ std::vector<base::StringPiece> existing_disabled_extensions =
+ base::SplitStringPiece(command_line_disable_gl_extensions, " ",
+ base::TRIM_WHITESPACE,
+ base::SPLIT_WANT_NONEMPTY);
disabled_extensions.insert(existing_disabled_extensions.begin(),
existing_disabled_extensions.end());
}
if (!disabled_extensions.empty()) {
- std::vector<std::string> v(disabled_extensions.begin(),
- disabled_extensions.end());
+ std::vector<base::StringPiece> v(disabled_extensions.begin(),
+ disabled_extensions.end());
command_line->AppendSwitchASCII(switches::kDisableGLExtensions,
base::JoinString(v, " "));
}

Powered by Google App Engine
This is Rietveld 408576698