Replaced cc::Display::SetSurfaceId() with SetLocalFrameId()

services/ui/surfaces/display_compositor_frame_sink.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 "services/ui/surfaces/display_compositor_frame_sink.h"
 
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 55 matching lines @@
   int max_frames_pending =
       display_output_surface->capabilities().max_frames_pending;
   DCHECK_GT(max_frames_pending, 0);
 
   std::unique_ptr<cc::DisplayScheduler> scheduler(
       new cc::DisplayScheduler(synthetic_begin_frame_source.get(),
                                task_runner_.get(), max_frames_pending));
 
   display_.reset(new cc::Display(
       nullptr /* bitmap_manager */, gpu_memory_buffer_manager,
-      cc::RendererSettings(), std::move(synthetic_begin_frame_source),
+      cc::RendererSettings(), frame_sink_id_,
+      std::move(synthetic_begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get())));
-  display_->Initialize(this, display_compositor_->manager(), frame_sink_id_);
+  display_->Initialize(this, display_compositor_->manager());
   display_->SetVisible(true);
 }
 
 DisplayCompositorFrameSink::~DisplayCompositorFrameSink() {
   display_compositor_->manager()->UnregisterSurfaceFactoryClient(
       frame_sink_id_);
   display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void DisplayCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame,
     const base::Callback<void()>& callback) {
   gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
   if (frame_size.IsEmpty() || frame_size != display_size_) {
     if (!local_frame_id_.is_null())
       factory_.Destroy(local_frame_id_);
     local_frame_id_ = allocator_.GenerateId();
     factory_.Create(local_frame_id_);
     display_size_ = frame_size;
     display_->Resize(display_size_);
   }
-  display_->SetSurfaceId(cc::SurfaceId(frame_sink_id_, local_frame_id_),
-                         frame.metadata.device_scale_factor);
+  display_->SetLocalFrameId(local_frame_id_,
+                            frame.metadata.device_scale_factor);
   factory_.SubmitCompositorFrame(local_frame_id_, std::move(frame), callback);
 }
 
 void DisplayCompositorFrameSink::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   // TODO(fsamuel): Implement this.
 }
 
 void DisplayCompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
@@ skipping 12 matching lines @@
   // This notification is not relevant to our client outside of tests.
 }
 
 void DisplayCompositorFrameSink::DisplayDidDrawAndSwap() {
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from the DrawCallback when the surface is going to
   // be drawn.
 }
 
 }  // namespace ui