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

android_webview/browser/parent_output_surface.h

Index: android_webview/browser/parent_output_surface.h
diff --git a/android_webview/browser/parent_output_surface.h b/android_webview/browser/parent_output_surface.h
index 5545551f53fb9c905501e1e8dd32179496d7e2d3..6d0a380d5fcc08ba38bffef1ea8d50562a92f7b5 100644
--- a/android_webview/browser/parent_output_surface.h
+++ b/android_webview/browser/parent_output_surface.h
@@ -5,7 +5,6 @@
 #ifndef ANDROID_WEBVIEW_BROWSER_PARENT_OUTPUT_SURFACE_H_
 #define ANDROID_WEBVIEW_BROWSER_PARENT_OUTPUT_SURFACE_H_
 
-#include "android_webview/browser/scoped_app_gl_state_restore.h"
 #include "base/macros.h"
 #include "cc/output/output_surface.h"
 
@@ -28,11 +27,9 @@ class ParentOutputSurface : NON_EXPORTED_BASE(public cc::OutputSurface) {
   void ApplyExternalStencil() override;
   uint32_t GetFramebufferCopyTextureFormat() override;
 
-  void SetGLState(const ScopedAppGLStateRestore& gl_state);
+  void UpdateStencilTest();
 
  private:
-  StencilState stencil_state_;
-
   DISALLOW_COPY_AND_ASSIGN(ParentOutputSurface);
 };