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

android_webview/browser/aw_gl_surface.cc

 // Copyright 2013 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 "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() {}
 
 void AwGLSurface::Destroy() {
 }
 
 bool AwGLSurface::IsOffscreen() {
   return false;
 }
 
 unsigned int AwGLSurface::GetBackingFramebufferObject() {
-  return fbo_;
+  return ScopedAppGLStateRestore::Current()->framebuffer_binding_ext();
 }
 
 gfx::SwapResult AwGLSurface::SwapBuffers() {
   return gfx::SwapResult::SWAP_ACK;
 }
 
 gfx::Size AwGLSurface::GetSize() {
   return gfx::Size(1, 1);
 }
 
 void* AwGLSurface::GetHandle() {
   return NULL;
 }
 
 void* AwGLSurface::GetDisplay() {
   return NULL;
 }
 
-void AwGLSurface::SetBackingFrameBufferObject(unsigned int fbo) {
-  fbo_ = fbo;
-}
-
 }  // namespace android_webview