Restore original WebView SurfaceId after showing interstitial.

content/browser/frame_host/render_widget_host_view_child_frame.cc

 // Copyright 2014 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 "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "cc/surfaces/surface.h"
@@ skipping 15 matching lines @@
 #include "content/public/common/browser_plugin_guest_mode.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/size_f.h"
 
 namespace content {
 
 RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(
     RenderWidgetHost* widget_host)
     : host_(RenderWidgetHostImpl::From(widget_host)),
       use_surfaces_(UseSurfacesEnabled()),
-      next_surface_sequence_(1u),
       last_output_surface_id_(0),
       current_surface_scale_factor_(1.f),
       ack_pending_count_(0),
       frame_connector_(nullptr),
       weak_factory_(this) {
   if (use_surfaces_) {
     id_allocator_ = CreateSurfaceIdAllocator();
     if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
       host_->delegate()->GetInputEventRouter()->AddSurfaceIdNamespaceOwner(
           GetSurfaceIdNamespace(), this);
@@ skipping 246 matching lines @@
 
   if (!surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
     surface_factory_ = make_scoped_ptr(new cc::SurfaceFactory(manager, this));
   }
 
   if (surface_id_.is_null()) {
     surface_id_ = id_allocator_->GenerateId();
     surface_factory_->Create(surface_id_);
 
-    cc::SurfaceSequence sequence = cc::SurfaceSequence(
-        id_allocator_->id_namespace(), next_surface_sequence_++);
+    surface_sequence_ = cc::SurfaceSequence(
+        id_allocator_->id_namespace(), surface_sequence_.sequence + 1);
     // The renderer process will satisfy this dependency when it creates a
     // SurfaceLayer.
     cc::SurfaceManager* manager = GetSurfaceManager();
-    manager->GetSurfaceForId(surface_id_)->AddDestructionDependency(sequence);
+    manager->GetSurfaceForId(surface_id_)
+        ->AddDestructionDependency(surface_sequence_);
     frame_connector_->SetChildFrameSurface(surface_id_, frame_size,
-                                           scale_factor, sequence);
+                                           scale_factor, surface_sequence_);
   }
 
   cc::SurfaceFactory::DrawCallback ack_callback =
       base::Bind(&RenderWidgetHostViewChildFrame::SurfaceDrawn, AsWeakPtr(),
                  output_surface_id);
   ack_pending_count_++;
   // If this value grows very large, something is going wrong.
   DCHECK_LT(ack_pending_count_, 1000U);
   surface_factory_->SubmitCompositorFrame(surface_id_, frame.Pass(),
                                           ack_callback);
@@ skipping 163 matching lines @@
 #endif
 }
 
 void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() {
   if (surface_factory_ && !surface_id_.is_null())
     surface_factory_->Destroy(surface_id_);
   surface_id_ = cc::SurfaceId();
 }
 
 }  // namespace content