Rename LocalFrameId to LocalSurfaceId

content/renderer/android/synchronous_compositor_frame_sink.cc

 // Copyright 2013 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/renderer/android/synchronous_compositor_frame_sink.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 227 matching lines @@
     return;
   }
 
   cc::CompositorFrame submit_frame;
 
   if (in_software_draw_) {
     // The frame we send to the client is actually just the metadata. Preserve
     // the |frame| for the software path below.
     submit_frame.metadata = frame.metadata.Clone();
 
-    if (!root_local_frame_id_.is_valid()) {
-      root_local_frame_id_ = surface_id_allocator_->GenerateId();
-      child_local_frame_id_ = surface_id_allocator_->GenerateId();
+    if (!root_local_surface_id_.is_valid()) {
+      root_local_surface_id_ = surface_id_allocator_->GenerateId();
+      child_local_surface_id_ = surface_id_allocator_->GenerateId();
     }
 
-    display_->SetLocalFrameId(root_local_frame_id_,
-                              frame.metadata.device_scale_factor);
+    display_->SetLocalSurfaceId(root_local_surface_id_,
+                                frame.metadata.device_scale_factor);
 
     // The layer compositor should be giving a frame that covers the
     // |sw_viewport_for_current_draw_| but at 0,0.
     gfx::Size child_size = sw_viewport_for_current_draw_.size();
     DCHECK(gfx::Rect(child_size) == frame.render_pass_list.back()->output_rect);
 
     // Make a size that covers from 0,0 and includes the area coming from the
     // layer compositor.
     gfx::Size display_size(sw_viewport_for_current_draw_.right(),
                            sw_viewport_for_current_draw_.bottom());
@@ skipping 23 matching lines @@
     auto* shared_quad_state =
         embed_render_pass->CreateAndAppendSharedQuadState();
     auto* surface_quad =
         embed_render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
     shared_quad_state->SetAll(
         child_transform, child_size, gfx::Rect(child_size),
         gfx::Rect() /* clip_rect */, false /* is_clipped */, 1.f /* opacity */,
         SkBlendMode::kSrcOver, 0 /* sorting_context_id */);
     surface_quad->SetNew(
         shared_quad_state, gfx::Rect(child_size), gfx::Rect(child_size),
-        cc::SurfaceId(kChildFrameSinkId, child_local_frame_id_));
+        cc::SurfaceId(kChildFrameSinkId, child_local_surface_id_));
 
-    child_factory_->SubmitCompositorFrame(
-        child_local_frame_id_, std::move(frame), base::Bind(&NoOpDrawCallback));
-    root_factory_->SubmitCompositorFrame(root_local_frame_id_,
+    child_factory_->SubmitCompositorFrame(child_local_surface_id_,
+                                          std::move(frame),
+                                          base::Bind(&NoOpDrawCallback));
+    root_factory_->SubmitCompositorFrame(root_local_surface_id_,
                                          std::move(embed_frame),
                                          base::Bind(&NoOpDrawCallback));
     display_->DrawAndSwap();
   } else {
     // For hardware draws we send the whole frame to the client so it can draw
     // the content in it.
     submit_frame = std::move(frame);
   }
 
   sync_client_->SubmitCompositorFrame(compositor_frame_sink_id_,
@@ skipping 157 matching lines @@
   client_->ReclaimResources(resources);
 }
 
 void SynchronousCompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Software output is synchronous and doesn't use a BeginFrameSource.
   NOTREACHED();
 }
 
 }  // namespace content