Add gfx::SurfaceFactoryWebview

android_webview/browser/scoped_app_gl_state_restore.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/scoped_app_gl_state_restore.h"
 
+#include "android_webview/browser/gl_surface_factory.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface_stub.h"
 
 namespace android_webview {
 
 namespace {
 
 // "App" context is a bit of a stretch. Basically we use this context while
@@ skipping 108 matching lines @@
   glGetBooleanv(GL_DITHER, &enable_dither_);
   glGetBooleanv(GL_POLYGON_OFFSET_FILL, &enable_polygon_offset_fill_);
   glGetBooleanv(GL_SAMPLE_ALPHA_TO_COVERAGE, &enable_sample_alpha_to_coverage_);
   glGetBooleanv(GL_SAMPLE_COVERAGE, &enable_sample_coverage_);
 
   glGetBooleanv(GL_STENCIL_TEST, &stencil_test_);
   glGetIntegerv(GL_STENCIL_FUNC, &stencil_func_);
   glGetIntegerv(GL_STENCIL_VALUE_MASK, &stencil_mask_);
   glGetIntegerv(GL_STENCIL_REF, &stencil_ref_);
 
+  glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_binding_ext_);
+  GLSurfaceFactory::SetCurrentFBO(framebuffer_binding_ext_);
 
   if (!g_gl_max_texture_units) {
     glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &g_gl_max_texture_units);
     DCHECK_GT(g_gl_max_texture_units, 0);
   }
 
   glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture_);
 
   texture_bindings_.resize(g_gl_max_texture_units);
   for (int ii = 0; ii < g_gl_max_texture_units; ++ii) {
     glActiveTexture(GL_TEXTURE0 + ii);
     TextureBindings& bindings = texture_bindings_[ii];
     glGetIntegerv(GL_TEXTURE_BINDING_2D, &bindings.texture_2d);
     glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bindings.texture_cube_map);
     glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES,
                   &bindings.texture_external_oes);
   }
 }
 
 ScopedAppGLStateRestore::~ScopedAppGLStateRestore() {
   TRACE_EVENT0("android_webview", "AppGLStateRestore");
   MakeAppContextCurrent();
 
+  GLSurfaceFactory::SetCurrentFBO(0);
+  glBindFramebufferEXT(GL_FRAMEBUFFER, framebuffer_binding_ext_);
   glBindBuffer(GL_ARRAY_BUFFER, vertex_array_buffer_binding_);
   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_array_buffer_binding_);
 
   for (int ii = 0; ii < g_gl_max_texture_units; ++ii) {
     glActiveTexture(GL_TEXTURE0 + ii);
     TextureBindings& bindings = texture_bindings_[ii];
     glBindTexture(GL_TEXTURE_2D, bindings.texture_2d);
     glBindTexture(GL_TEXTURE_CUBE_MAP, bindings.texture_cube_map);
     glBindTexture(GL_TEXTURE_EXTERNAL_OES, bindings.texture_external_oes);
   }
@@ skipping 56 matching lines @@
 
     glScissor(
         scissor_box_[0], scissor_box_[1], scissor_box_[2], scissor_box_[3]);
   }
 
   GLEnableDisable(GL_STENCIL_TEST, stencil_test_);
   glStencilFunc(stencil_func_, stencil_mask_, stencil_ref_);
 }
 
 }  // namespace android_webview