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

Unified Diff: ui/gl/gl_gl_api_implementation.cc

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/devices/device_util_linux.cc ('k') | ui/gl/gl_version_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_gl_api_implementation.cc
diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc
index 5bea3f12ae977e0621f536b41d609b9b5a09daab..bffa64e56ffd4788c232473ccee378fb3f41d646 100644
--- a/ui/gl/gl_gl_api_implementation.cc
+++ b/ui/gl/gl_gl_api_implementation.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "base/command_line.h"
+#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_implementation.h"
@@ -437,8 +438,8 @@ void VirtualGLApi::Initialize(DriverGL* driver, GLContext* real_context) {
DCHECK(real_context->IsCurrent(NULL));
std::string ext_string(
reinterpret_cast<const char*>(driver_->fn.glGetStringFn(GL_EXTENSIONS)));
- std::vector<std::string> ext;
- Tokenize(ext_string, " ", &ext);
+ std::vector<std::string> ext = base::SplitString(
+ ext_string, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
std::vector<std::string>::iterator it;
// We can't support GL_EXT_occlusion_query_boolean which is
@@ -448,7 +449,7 @@ void VirtualGLApi::Initialize(DriverGL* driver, GLContext* real_context) {
if (it != ext.end())
ext.erase(it);
- extensions_ = JoinString(ext, " ");
+ extensions_ = base::JoinString(ext, " ");
}
bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {
« no previous file with comments | « ui/events/devices/device_util_linux.cc ('k') | ui/gl/gl_version_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698