Allow GLSurface to indicate that it supports a specific extension.

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <set>
 #include <string>
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
+#include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
 
 namespace gpu {
 namespace gles2 {
 
 FeatureInfo::FeatureInfo() {
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
@@ skipping 69 matching lines @@
 bool FeatureInfo::Initialize(const DisallowedFeatures& disallowed_features,
                              const char* allowed_features) {
   disallowed_features_ = disallowed_features;
   AddFeatures(allowed_features);
   return true;
 }
 
 void FeatureInfo::AddFeatures(const char* desired_features) {
   // Figure out what extensions to turn on.
   ExtensionHelper ext(
-      reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)),
+      // Some unittests execute without a context made current
+      // so fall back to glGetString
+      gfx::GLContext::GetCurrent() ?
+          gfx::GLContext::GetCurrent()->GetExtensions().c_str() :
+          reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)),
       desired_features);
 
   bool npot_ok = false;
 
   AddExtensionString("GL_CHROMIUM_resource_safe");
   AddExtensionString("GL_CHROMIUM_resize");
   AddExtensionString("GL_CHROMIUM_strict_attribs");
   AddExtensionString("GL_CHROMIUM_swapbuffers_complete_callback");
   AddExtensionString("GL_CHROMIUM_rate_limit_offscreen_context");
   AddExtensionString("GL_CHROMIUM_set_visibility");
@@ skipping 241 matching lines @@
 
   // TODO(gman): Add support for these extensions.
   //     GL_OES_depth32
   //     GL_OES_element_index_uint
 
   feature_flags_.enable_texture_float_linear = enable_texture_float_linear;
   feature_flags_.enable_texture_half_float_linear =
       enable_texture_half_float_linear;
   feature_flags_.npot_ok = npot_ok;
 
-  if (ext.Desire("GL_CHROMIUM_post_sub_buffer") &&
-      gfx::GLSurface::GetCurrent() &&
-      gfx::GLSurface::GetCurrent()->SupportsPostSubBuffer()) {
+  if (ext.HaveAndDesire("GL_CHROMIUM_post_sub_buffer")) {
     AddExtensionString("GL_CHROMIUM_post_sub_buffer");
   }
 }
 
 void FeatureInfo::AddExtensionString(const std::string& str) {
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu