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 835 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.
-  bool disable_all_multisample =
-      workarounds_.disable_msaa_on_non_webgl_contexts && !IsWebGLContext();
-
-  if (!disable_all_multisample &&
-      !workarounds_.disable_chromium_framebuffer_multisample) {
+  if (!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");
     }
     feature_flags_.use_core_framebuffer_multisample =
         gl_version_info_->is_es3 || gl_version_info_->is_desktop_core_profile;
     if (ext_has_multisample) {
       feature_flags_.chromium_framebuffer_multisample = true;
       validators_.frame_buffer_target.AddValue(GL_READ_FRAMEBUFFER_EXT);
       validators_.frame_buffer_target.AddValue(GL_DRAW_FRAMEBUFFER_EXT);
       validators_.g_l_state.AddValue(GL_READ_FRAMEBUFFER_BINDING_EXT);
       validators_.g_l_state.AddValue(GL_MAX_SAMPLES_EXT);
       validators_.render_buffer_parameter.AddValue(GL_RENDERBUFFER_SAMPLES_EXT);
       AddExtensionString("GL_CHROMIUM_framebuffer_multisample");
     }
   }
 
-  if (!disable_all_multisample &&
-      !workarounds_.disable_multisampled_render_to_texture) {
+  if (!workarounds_.disable_multisampled_render_to_texture) {
     if (extensions.Contains("GL_EXT_multisampled_render_to_texture")) {
       feature_flags_.multisampled_render_to_texture = true;
     } else if (extensions.Contains("GL_IMG_multisampled_render_to_texture")) {
       feature_flags_.multisampled_render_to_texture = true;
       feature_flags_.use_img_for_multisampled_render_to_texture = true;
     }
     if (feature_flags_.multisampled_render_to_texture) {
       validators_.render_buffer_parameter.AddValue(
           GL_RENDERBUFFER_SAMPLES_EXT);
       validators_.g_l_state.AddValue(GL_MAX_SAMPLES_EXT);
       validators_.frame_buffer_parameter.AddValue(
           GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT);
       AddExtensionString("GL_EXT_multisampled_render_to_texture");
     }
   }
 
-  if (!disable_all_multisample &&
-      (!gl_version_info_->is_es ||
-       extensions.Contains("GL_EXT_multisample_compatibility"))) {
+  if (!gl_version_info_->is_es ||
+       extensions.Contains("GL_EXT_multisample_compatibility")) {
     AddExtensionString("GL_EXT_multisample_compatibility");
     feature_flags_.ext_multisample_compatibility = true;
     validators_.capability.AddValue(GL_MULTISAMPLE_EXT);
     validators_.capability.AddValue(GL_SAMPLE_ALPHA_TO_ONE_EXT);
   }
 
   if (extensions.Contains("GL_INTEL_framebuffer_CMAA")) {
     feature_flags_.chromium_screen_space_antialiasing = true;
     AddExtensionString("GL_CHROMIUM_screen_space_antialiasing");
   }
@@ skipping 517 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu