Revert of Fix HTML5 video blurry

cc/output/shader.h

 // Copyright 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.
 
 #ifndef CC_OUTPUT_SHADER_H_
 #define CC_OUTPUT_SHADER_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 406 matching lines @@
     int fragment_tex_transform_location() const { return -1; }
     int sampler_location() const { return sampler_location_; }
 
  private:
     int sampler_location_;
     int alpha_location_;
     int color_matrix_location_;
     int color_offset_location_;
 };
 
-class FragmentTexQuadBase : public FragmentTexBlendMode {
+class FragmentTexOpaqueBinding : public FragmentTexBlendMode {
  public:
-  FragmentTexQuadBase() = default;
-  virtual ~FragmentTexQuadBase() = default;
-
-  int sampler_location() const { return sampler_location_; }
-  virtual int background_color_location() const;
-  virtual int tex_clamp_rect_location() const;
-
- protected:
-  int sampler_location_ = -1;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FragmentTexQuadBase);
-};
-
-class FragmentTexClampBinding : public FragmentTexQuadBase {
- public:
-  FragmentTexClampBinding() = default;
+  FragmentTexOpaqueBinding();
 
   void Init(gpu::gles2::GLES2Interface* context,
             unsigned program,
             int* base_uniform_index);
-  int tex_clamp_rect_location() const final;
+  int alpha_location() const { return -1; }
+  int fragment_tex_transform_location() const { return -1; }
+  int background_color_location() const { return -1; }
+  int sampler_location() const { return sampler_location_; }
 
  private:
-  int tex_clamp_rect_location_ = -1;
+  int sampler_location_;
 
-  DISALLOW_COPY_AND_ASSIGN(FragmentTexClampBinding);
+  DISALLOW_COPY_AND_ASSIGN(FragmentTexOpaqueBinding);
 };
 
-class FragmentTexBackgroundBinding : public FragmentTexQuadBase {
+class FragmentTexBackgroundBinding : public FragmentTexBlendMode {
  public:
   FragmentTexBackgroundBinding();
 
   void Init(gpu::gles2::GLES2Interface* context,
             unsigned program,
             int* base_uniform_index);
-  int background_color_location() const final;
+  int background_color_location() const { return background_color_location_; }
+  int sampler_location() const { return sampler_location_; }
 
  private:
   int background_color_location_;
+  int sampler_location_;
 
   DISALLOW_COPY_AND_ASSIGN(FragmentTexBackgroundBinding);
 };
 
-class FragmentShaderRGBATexClampVaryingAlpha : public FragmentTexClampBinding {
+class FragmentShaderRGBATexVaryingAlpha : public FragmentTexOpaqueBinding {
  public:
   std::string GetShaderString(
       TexCoordPrecision precision, SamplerType sampler) const;
   static std::string GetShaderHead();
   static std::string GetShaderBody();
 };
 
-class FragmentShaderRGBATexClampPremultiplyAlpha
-    : public FragmentTexClampBinding {
- public:
-  std::string GetShaderString(TexCoordPrecision precision,
-                              SamplerType sampler) const;
-  static std::string GetShaderHead();
-  static std::string GetShaderBody();
-};
-
-class FragmentShaderRGBATexClamp : public FragmentTexClampBinding {
+class FragmentShaderRGBATexPremultiplyAlpha : public FragmentTexOpaqueBinding {
  public:
   std::string GetShaderString(
       TexCoordPrecision precision, SamplerType sampler) const;
   static std::string GetShaderHead();
   static std::string GetShaderBody();
 };
 
 class FragmentShaderTexBackgroundVaryingAlpha
     : public FragmentTexBackgroundBinding {
  public:
@@ skipping 24 matching lines @@
 class FragmentShaderRGBATexColorMatrixAlpha
     : public FragmentTexColorMatrixAlphaBinding {
  public:
   std::string GetShaderString(TexCoordPrecision precision,
                               SamplerType sampler) const;
   static std::string GetShaderHead();
   static std::string GetShaderBody();
   void FillLocations(ShaderLocations* locations) const;
 };
 
-class FragmentTexOpaqueBinding : public FragmentTexBlendMode {
- public:
-  FragmentTexOpaqueBinding();
-
-  void Init(gpu::gles2::GLES2Interface* context,
-            unsigned program,
-            int* base_uniform_index);
-  int alpha_location() const { return -1; }
-  int fragment_tex_transform_location() const { return -1; }
-  int sampler_location() const { return sampler_location_; }
-
- private:
-  int sampler_location_;
-
-  DISALLOW_COPY_AND_ASSIGN(FragmentTexOpaqueBinding);
-};
-
 class FragmentShaderRGBATexOpaque : public FragmentTexOpaqueBinding {
  public:
   std::string GetShaderString(
       TexCoordPrecision precision, SamplerType sampler) const;
+  static std::string GetShaderHead();
+  static std::string GetShaderBody();
+};
+
+class FragmentShaderRGBATex : public FragmentTexOpaqueBinding {
+ public:
+  std::string GetShaderString(
+      TexCoordPrecision precision, SamplerType sampler) const;
   static std::string GetShaderHead();
   static std::string GetShaderBody();
 };
 
 // Swizzles the red and blue component of sampled texel with alpha.
 class FragmentShaderRGBATexSwizzleAlpha : public FragmentTexAlphaBinding {
  public:
   std::string GetShaderString(
       TexCoordPrecision precision, SamplerType sampler) const;
   static std::string GetShaderHead();
@@ skipping 307 matching lines @@
 
  private:
   int color_location_;
 
   DISALLOW_COPY_AND_ASSIGN(FragmentShaderColorAA);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_SHADER_H_