cc: De-special-case SurfaceLayer code

ui/aura/local/window_port_local.cc

 // Copyright 2016 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 "ui/aura/local/window_port_local.h"
 
 #include "cc/surfaces/surface_manager.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/local/compositor_frame_sink_local.h"
@@ skipping 116 matching lines @@
 
 void WindowPortLocal::OnSurfaceChanged(const cc::SurfaceId& surface_id,
                                        const gfx::Size& surface_size) {
   DCHECK_EQ(surface_id.frame_sink_id(), frame_sink_id_);
   local_surface_id_ = surface_id.local_surface_id();
   // The bounds must be updated before switching to the new surface, because
   // the layer may be mirrored, in which case a surface change causes the
   // mirror layer to update its surface using the latest bounds.
   window_->layer()->SetBounds(
       gfx::Rect(window_->layer()->bounds().origin(), surface_size));
-  window_->layer()->SetShowPrimarySurface(
-      cc::SurfaceInfo(surface_id, 1.0f, surface_size),
+  cc::SurfaceInfo surface_info(surface_id, 1.0f, surface_size);
+  scoped_refptr<cc::SurfaceReferenceFactory> reference_factory =
       aura::Env::GetInstance()
           ->context_factory_private()
           ->GetSurfaceManager()
-          ->reference_factory());
+          ->reference_factory();
+  window_->layer()->SetShowPrimarySurface(surface_info, reference_factory);
+  window_->layer()->SetFallbackSurface(surface_info);
 }
 
 }  // namespace aura