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

android_webview/browser/hardware_renderer.cc

Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index 4a1f37cbe6c17cfb3f85169d344a4d73be11bb0f..45b589f163e112670148d8e7f2fb1803f97d31e6 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -70,8 +70,7 @@ void HardwareRenderer::CommitFrame() {
   DCHECK(!child_frame_->frame->gl_frame_data);
 }
 
-void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info,
-                              const ScopedAppGLStateRestore& gl_state) {
+void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info) {
   TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL");
 
   // We need to watch if the current Android context has changed and enforce
@@ -141,8 +140,7 @@ void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info,
   gfx::Rect clip(draw_info->clip_left, draw_info->clip_top,
                  draw_info->clip_right - draw_info->clip_left,
                  draw_info->clip_bottom - draw_info->clip_top);
-  surfaces_->DrawAndSwap(viewport, clip, transform, frame_size_, child_id_,
-                         gl_state);
+  surfaces_->DrawAndSwap(viewport, clip, transform, frame_size_, child_id_);
 }
 
 void HardwareRenderer::AllocateSurface() {
@@ -172,11 +170,6 @@ void HardwareRenderer::SetBeginFrameSource(
   // TODO(tansell): Hook this up.
 }
 
-void HardwareRenderer::SetBackingFrameBufferObject(
-    int framebuffer_binding_ext) {
-  surfaces_->SetBackingFrameBufferObject(framebuffer_binding_ext);
-}
-
 void HardwareRenderer::ReturnResourcesInChildFrame() {
   if (child_frame_.get() && child_frame_->frame.get()) {
     cc::ReturnedResourceArray resources_to_return;