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

services/ui/ws/server_window_compositor_frame_sink.cc

 // Copyright 2015 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/ws/server_window_compositor_frame_sink.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 65 matching lines @@
     surface_factory_.Create(local_frame_id_);
     if (display_)
       display_->Resize(frame_size);
   }
   ++ack_pending_count_;
   surface_factory_.SubmitCompositorFrame(
       local_frame_id_, std::move(frame),
       base::Bind(&ServerWindowCompositorFrameSink::DidReceiveCompositorFrameAck,
                  base::Unretained(this)));
   if (display_) {
-    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);
   }
   last_submitted_frame_size_ = frame_size;
 }
 
 void ServerWindowCompositorFrameSink::DidReceiveCompositorFrameAck() {
   if (!client_)
     return;
   client_->DidReceiveCompositorFrameAck();
   DCHECK_GT(ack_pending_count_, 0);
   if (!surface_returned_resources_.empty()) {
@@ skipping 45 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);
 }
 
 void ServerWindowCompositorFrameSink::DisplayOutputSurfaceLost() {}
 
 void ServerWindowCompositorFrameSink::DisplayWillDrawAndSwap(
     bool will_draw_and_swap,
     const cc::RenderPassList& render_passes) {}
 
 void ServerWindowCompositorFrameSink::DisplayDidDrawAndSwap() {}
@@ skipping 48 matching lines @@
 
   added_frame_observer_ = needs_begin_frame_;
   if (needs_begin_frame_)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 }  // namespace ws
 }  // namespace ui