Revert of ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (patchset #15 id:280001 of https://codereview.chromium.org/1401423003/ )

Reason for revert:
Causing android gpu bots to fail

Original issue's description:
> ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.
>
> This allows the GPU service to properly track the memory usage
> image backed textures.
>
> It also reduces the complexity of GLImage implementations
> significantly and makes it easier to support format and
> buffer types that require a copy or conversion of data to
> be used for sampling.
>
> This change also includes a few minor GLImage cleanups such
> as removing gfx:: namespace prefix in places where it's not
> needed and making the CopyTexImage GLImage test not part of
> the core GLImage tests as it's optional to support that
> function.
>
> BUG=526298
> TEST=gl_tests --gtest_filter=GpuMemoryBuffer*, gpu_unittests, gl_unittests --gtest_filter=GLImage*
>
> Committed: https://crrev.com/ac2696e324bda3824952148f831e76a8b80594b3
> Cr-Commit-Position: refs/heads/master@{#354870}

TBR=dcastagna@chromium.org,ericrk@chromium.org,fsamuel@chromium.org,liberato@chromium.org,sievers@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=526298

Review URL: https://codereview.chromium.org/1418483003

Cr-Commit-Position: refs/heads/master@{#354914}

1 files changed, 8 insertions, 5 deletions

diff --git a/ui/gl/gl_image_egl.h b/ui/gl/gl_image_egl.h
index 4110fd0d..14cc40b 100644
--- a/ui/gl/gl_image_egl.h
+++ b/ui/gl/gl_image_egl.h
@@ -13,21 +13,24 @@ namespace gfx {
 
 class GL_EXPORT GLImageEGL : public GLImage {
  public:
-  explicit GLImageEGL(const Size& size);
+  explicit GLImageEGL(const gfx::Size& size);
 
   bool Initialize(EGLenum target, EGLClientBuffer buffer, const EGLint* attrs);
 
   // Overridden from GLImage:
   void Destroy(bool have_context) override;
-  Size GetSize() override;
+  gfx::Size GetSize() override;
   unsigned GetInternalFormat() override;
   bool BindTexImage(unsigned target) override;
   void ReleaseTexImage(unsigned target) override {}
-  bool CopyTexImage(unsigned target) override;
   bool CopyTexSubImage(unsigned target,
                        const Point& offset,
                        const Rect& rect) override;
-  bool ScheduleOverlayPlane(AcceleratedWidget widget,
+  void WillUseTexImage() override {}
+  void DidUseTexImage() override {}
+  void WillModifyTexImage() override {}
+  void DidModifyTexImage() override {}
+  bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int z_order,
                             OverlayTransform transform,
                             const Rect& bounds_rect,
@@ -37,7 +40,7 @@ class GL_EXPORT GLImageEGL : public GLImage {
   ~GLImageEGL() override;
 
   EGLImageKHR egl_image_;
-  const Size size_;
+  const gfx::Size size_;
   base::ThreadChecker thread_checker_;
 
  private: