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

android_webview/browser/surfaces_instance.h

Index: android_webview/browser/surfaces_instance.h
diff --git a/android_webview/browser/surfaces_instance.h b/android_webview/browser/surfaces_instance.h
index 5dec3d8b227f3fe22be40c2c18fe9d2a62b84c69..55a89060586bc0e0660875d5337c5e13f194b74e 100644
--- a/android_webview/browser/surfaces_instance.h
+++ b/android_webview/browser/surfaces_instance.h
@@ -40,14 +40,12 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
 
   uint32_t AllocateSurfaceClientId();
   cc::SurfaceManager* GetSurfaceManager();
-  void SetBackingFrameBufferObject(int framebuffer_binding_ext);
 
   void DrawAndSwap(const gfx::Size& viewport,
                    const gfx::Rect& clip,
                    const gfx::Transform& transform,
                    const gfx::Size& frame_size,
-                   const cc::SurfaceId& child_id,
-                   const ScopedAppGLStateRestore& gl_state);
+                   const cc::SurfaceId& child_id);
 
   void AddChildId(const cc::SurfaceId& child_id);
   void RemoveChildId(const cc::SurfaceId& child_id);
@@ -74,7 +72,6 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
 
   uint32_t next_surface_client_id_;
 
-  scoped_refptr<AwGLSurface> gl_surface_;
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
   std::unique_ptr<cc::Display> display_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;