GPU: Keep track of the last real context and real surface made current.

ui/gl/gl_context_android.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 "ui/gl/gl_context.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/sys_info.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_egl.h"
 #include "ui/gl/gl_context_stub.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
 namespace {
 
 // Used to render into an already current context+surface,
 // that we do not have ownership of (draw callback).
-class GLNonOwnedContext : public GLContext {
+class GLNonOwnedContext : public GLContextReal {
  public:
   GLNonOwnedContext(GLShareGroup* share_group);
 
   // Implement GLContext.
   virtual bool Initialize(GLSurface* compatible_surface,
                           GpuPreference gpu_preference) OVERRIDE {
     return true;
   }
   virtual void Destroy() OVERRIDE {}
   virtual bool MakeCurrent(GLSurface* surface) OVERRIDE;
   virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE {}
   virtual bool IsCurrent(GLSurface* surface) OVERRIDE { return true; }
   virtual void* GetHandle() OVERRIDE { return NULL; }
   virtual void SetSwapInterval(int interval) OVERRIDE {}
   virtual std::string GetExtensions() OVERRIDE;
 
  protected:
   virtual ~GLNonOwnedContext() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLNonOwnedContext);
 };
 
 GLNonOwnedContext::GLNonOwnedContext(GLShareGroup* share_group)
-  : GLContext(share_group) {}
+  : GLContextReal(share_group) {}
 
 bool GLNonOwnedContext::MakeCurrent(GLSurface* surface) {
-  SetCurrent(this, surface);
+  SetCurrent(surface);
   SetRealGLApi();
   return true;
 }
 
 std::string GLNonOwnedContext::GetExtensions() {
   return GLContext::GetExtensions();
 }
 
 }  // anonymous namespace
 
@@ skipping 45 matching lines @@
         limit = heap_size / 2;
     else
         limit = (heap_size + (heap_growth * 2)) / 4;
     dalvik_limit = limit * 1024 * 1024;
   }
   *bytes = dalvik_limit;
   return true;
 }
 
 }