Add CONTEXT_TYPE_OPENGLES2_PEPPER

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/feature_info.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
@@ skipping 838 matching lines @@
   // Enable the GL_EXT_color_buffer_float extension for WebGL 2.0
   if (enable_ext_color_buffer_float && IsES3Capable()) {
     ext_color_buffer_float_available_ = true;
     if (!disallowed_features_.ext_color_buffer_float)
       EnableEXTColorBufferFloat();
   }
 
   // Check for multisample support
 
   // crbug.com/527565 - On some GPUs, MSAA does not perform acceptably for
-  // rasterization. We disable it on non-WebGL contexts. For WebGL contexts
-  // we leave it up to the site to decide whether to enable MSAA.
+  // rasterization. For externally exposed (WebGL or Pepper) contexts we leave
+  // it up to the site to decide whether to enable MSAA.
   bool disable_all_multisample =
-      workarounds_.disable_msaa_on_non_webgl_contexts && !IsWebGLContext();
+      workarounds_.disable_msaa_on_internal_contexts && !IsWebGLContext() &&
+      !IsPepperContext();
 
   if (!disable_all_multisample &&
       !workarounds_.disable_chromium_framebuffer_multisample) {
     bool ext_has_multisample =
         extensions.Contains("GL_EXT_framebuffer_multisample") ||
         gl_version_info_->is_es3 ||
         gl_version_info_->is_desktop_core_profile;
     if (gl_version_info_->is_angle) {
       ext_has_multisample |=
           extensions.Contains("GL_ANGLE_framebuffer_multisample");
@@ skipping 536 matching lines @@
 }
 
 bool FeatureInfo::IsWebGLContext() const {
   // Switch statement to cause a compile-time error if we miss a case.
   switch (context_type_) {
     case CONTEXT_TYPE_WEBGL1:
     case CONTEXT_TYPE_WEBGL2:
       return true;
     case CONTEXT_TYPE_OPENGLES2:
     case CONTEXT_TYPE_OPENGLES3:
+    case CONTEXT_TYPE_OPENGLES2_PEPPER:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
+bool FeatureInfo::IsPepperContext() const {
+  // Switch statement to cause a compile-time error if we miss a case.
+  switch (context_type_) {
+    case CONTEXT_TYPE_WEBGL1:
+    case CONTEXT_TYPE_WEBGL2:
+    case CONTEXT_TYPE_OPENGLES2:
+    case CONTEXT_TYPE_OPENGLES3:
+      return false;
+    case CONTEXT_TYPE_OPENGLES2_PEPPER:
+      return true;
+  }
+
+  NOTREACHED();
+  return false;
+}
+
 void FeatureInfo::AddExtensionString(const char* s) {
   std::string str(s);
   size_t pos = extensions_.find(str);
   while (pos != std::string::npos &&
          pos + str.length() < extensions_.length() &&
          extensions_.substr(pos + str.length(), 1) != " ") {
     // This extension name is a substring of another.
     pos = extensions_.find(str, pos + str.length());
   }
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu