Revert 171569 as it broke some browser_tests on win_aura.

content/common/gpu/client/gl_helper.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
 #define CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
 
 #include "base/atomicops.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
-class SkRegion;
-
 namespace content {
 
 // Provides higher level operations on top of the WebKit::WebGraphicsContext3D
 // interfaces.
 class GLHelper {
  public:
   GLHelper(WebKit::WebGraphicsContext3D* context,
            WebKit::WebGraphicsContext3D* context_for_thread);
   virtual ~GLHelper();
 
@@ skipping 30 matching lines @@
   // the texture and |dst_size| is the size of the resulting copy.
   WebKit::WebGLId CopyAndScaleTexture(WebKit::WebGLId texture,
                                       const gfx::Size& src_size,
                                       const gfx::Size& dst_size,
                                       bool vertically_flip_texture);
 
   // Returns the shader compiled from the source.
   WebKit::WebGLId CompileShaderFromSource(const WebKit::WGC3Dchar* source,
                                           WebKit::WGC3Denum type);
 
-  // Copies all pixels from |previous_texture| into |texture| that are
-  // inside the region covered by |old_damage| but not part of |new_damage|.
-  void CopySubBufferDamage(WebKit::WebGLId texture,
-                           WebKit::WebGLId previous_texture,
-                           const SkRegion& new_damage,
-                           const SkRegion& old_damage);
  private:
   class CopyTextureToImpl;
 
   // Creates |copy_texture_to_impl_| if NULL.
   void InitCopyTextToImpl();
 
   WebKit::WebGraphicsContext3D* context_;
   WebKit::WebGraphicsContext3D* context_for_thread_;
   scoped_ptr<CopyTextureToImpl> copy_texture_to_impl_;
 
   // The number of all GLHelper instances.
   static base::subtle::Atomic32 count_;
 
   DISALLOW_COPY_AND_ASSIGN(GLHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_