[Merge M54] aw: Fix FBO restore in webview functor

android_webview/browser/aw_gl_surface.cc

Index: android_webview/browser/aw_gl_surface.cc
diff --git a/android_webview/browser/aw_gl_surface.cc b/android_webview/browser/aw_gl_surface.cc
index 9f2163b64caacfc7eb7f231e046d4354b989ddd7..c2ed5ab59eaef8895d4ef214edbdb36042ba14e6 100644
--- a/android_webview/browser/aw_gl_surface.cc
+++ b/android_webview/browser/aw_gl_surface.cc
@@ -4,9 +4,11 @@
 
 #include "android_webview/browser/aw_gl_surface.h"
 
+#include "android_webview/browser/scoped_app_gl_state_restore.h"
+
 namespace android_webview {
 
-AwGLSurface::AwGLSurface() : fbo_(0) {}
+AwGLSurface::AwGLSurface() {}
 
 AwGLSurface::~AwGLSurface() {}
 
@@ -18,7 +20,7 @@ bool AwGLSurface::IsOffscreen() {
 }
 
 unsigned int AwGLSurface::GetBackingFramebufferObject() {
-  return fbo_;
+  return ScopedAppGLStateRestore::Current()->framebuffer_binding_ext();
 }
 
 gfx::SwapResult AwGLSurface::SwapBuffers() {
@@ -37,8 +39,4 @@ void* AwGLSurface::GetDisplay() {
   return NULL;
 }
 
-void AwGLSurface::SetBackingFrameBufferObject(unsigned int fbo) {
-  fbo_ = fbo;
-}
-
 }  // namespace android_webview