Update from https://crrev.com/306655

services/surfaces/surfaces_impl.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 "services/surfaces/surfaces_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/display.h"
@@ skipping 26 matching lines @@
   factory_.DestroyAll();
 }
 
 void SurfacesImpl::CreateSurface(SurfaceIdPtr id, SizePtr size) {
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
     // Bad message, do something bad to the caller?
     NOTREACHED();
     return;
   }
-  factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>());
+  factory_.Create(id.To<cc::SurfaceId>());
 }
 
 void SurfacesImpl::SubmitFrame(SurfaceIdPtr id,
                                FramePtr frame_ptr,
                                const Closure& callback) {
   TRACE_EVENT0("mojo", "SurfacesImpl::SubmitFrame");
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
     // Bad message, do something bad to the caller?
     LOG(FATAL) << "Received frame for id " << cc_id.id << " namespace "
@@ skipping 32 matching lines @@
                << " should be namespace " << id_namespace_;
     return;
   }
   if (!display_) {
     cc::RendererSettings settings;
     display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));
     client_->SetDisplay(display_.get());
     display_->Initialize(make_scoped_ptr(new DirectOutputSurface(
         new ContextProviderMojo(command_buffer_handle_.Pass()))));
   }
-  factory_.Create(cc_id, size.To<gfx::Size>());
-  display_->Resize(cc_id, size.To<gfx::Size>(), 1.f);
+  factory_.Create(cc_id);
+  display_->SetSurfaceId(cc_id, 1.f);
+  display_->Resize(size.To<gfx::Size>());
   parameter_listeners_.AddBinding(this, listener_request.Pass());
 }
 
 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
   Array<ReturnedResourcePtr> ret(resources.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     ret[i] = ReturnedResource::From(resources[i]);
   }
   binding_.client()->ReturnResources(ret.Pass());
 }
@@ skipping 18 matching lines @@
 }
 
 void SurfacesImpl::OnVSyncParametersUpdated(int64_t timebase,
                                             int64_t interval) {
   client_->OnVSyncParametersUpdated(
       base::TimeTicks::FromInternalValue(timebase),
       base::TimeDelta::FromInternalValue(interval));
 }
 
 }  // namespace mojo