Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

content/browser/frame_host/render_widget_host_view_guest.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_guest.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 95 matching lines @@
   // Make sure the size of this view matches the size of the WebContentsView.
   // The two sizes may fall out of sync if we switch RenderWidgetHostViews,
   // resize, and then switch page, as is the case with interstitial pages.
   // NOTE: |guest_| is NULL in unit tests.
   if (guest_) {
     SetSize(guest_->web_contents()->GetViewBounds().size());
     // Since we were last shown, our renderer may have had a different surface
     // set (e.g. showing an interstitial), so we resend our current surface to
     // the renderer.
     if (!surface_id_.is_null()) {
-      cc::SurfaceSequence sequence = cc::SurfaceSequence(
-          id_allocator_->frame_sink_id(), next_surface_sequence_++);
+      cc::SurfaceSequence sequence =
+          cc::SurfaceSequence(frame_sink_id_, next_surface_sequence_++);
       GetSurfaceManager()
           ->GetSurfaceForId(surface_id_)
           ->AddDestructionDependency(sequence);
       guest_->SetChildFrameSurface(surface_id_, current_surface_size_,
                                    current_surface_scale_factor_,
                                    sequence);
     }
   }
   host_->WasShown(ui::LatencyInfo());
 }
@@ skipping 158 matching lines @@
       scale_factor != current_surface_scale_factor_ ||
       (guest_ && guest_->has_attached_since_surface_set())) {
     ClearCompositorSurfaceIfNecessary();
     last_compositor_frame_sink_id_ = compositor_frame_sink_id;
     current_surface_size_ = frame_size;
     current_surface_scale_factor_ = scale_factor;
   }
 
   if (!surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
-    surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(manager, this);
+    surface_factory_ =
+        base::MakeUnique<cc::SurfaceFactory>(frame_sink_id_, manager, this);
   }
 
   if (surface_id_.is_null()) {
     surface_id_ = id_allocator_->GenerateId();
     surface_factory_->Create(surface_id_);
 
-    cc::SurfaceSequence sequence = cc::SurfaceSequence(
-        id_allocator_->frame_sink_id(), next_surface_sequence_++);
+    cc::SurfaceSequence sequence =
+        cc::SurfaceSequence(frame_sink_id_, next_surface_sequence_++);
     // The renderer process will satisfy this dependency when it creates a
     // SurfaceLayer.
     cc::SurfaceManager* manager = GetSurfaceManager();
     manager->GetSurfaceForId(surface_id_)->AddDestructionDependency(sequence);
     // TODO(wjmaclean): I'm not sure what it means to create a surface id
     // without setting it on the child, though since we will in this case be
     // guaranteed to call ClearCompositorSurfaceIfNecessary() below, I suspect
     // skipping SetChildFrameSurface() here is irrelevant.
     if (guest_ && !guest_->is_in_destruction()) {
       guest_->SetChildFrameSurface(surface_id_, frame_size, scale_factor,
@@ skipping 361 matching lines @@
         gesture_event.data.scrollUpdate.inertialPhase ==
             blink::WebGestureEvent::MomentumPhase) {
       return;
     }
     host_->ForwardGestureEvent(gesture_event);
     return;
   }
 }
 
 }  // namespace content