Update Surface ID Terminology

content/browser/frame_host/render_widget_host_view_child_frame.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 "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 30 matching lines @@
 RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(
     RenderWidgetHost* widget_host)
     : host_(RenderWidgetHostImpl::From(widget_host)),
       next_surface_sequence_(1u),
       last_output_surface_id_(0),
       current_surface_scale_factor_(1.f),
       ack_pending_count_(0),
       frame_connector_(nullptr),
       begin_frame_source_(nullptr),
       observing_begin_frame_source_(false),
-      parent_surface_id_namespace_(0),
+      parent_surface_client_id_(0),
       weak_factory_(this) {
   id_allocator_ = CreateSurfaceIdAllocator();
   RegisterSurfaceNamespaceId();
 
   host_->SetView(this);
 }
 
 RenderWidgetHostViewChildFrame::~RenderWidgetHostViewChildFrame() {
   if (!surface_id_.is_null())
     surface_factory_->Destroy(surface_id_);
 }
 
 void RenderWidgetHostViewChildFrame::SetCrossProcessFrameConnector(
     CrossProcessFrameConnector* frame_connector) {
   if (frame_connector_ == frame_connector)
     return;
 
   if (frame_connector_) {
-    if (parent_surface_id_namespace_) {
+    if (parent_surface_client_id_) {
       GetSurfaceManager()->UnregisterSurfaceNamespaceHierarchy(
-          parent_surface_id_namespace_, GetSurfaceIdNamespace());
+          parent_surface_client_id_, GetSurfaceClientId());
     }
     // Unregister the client here, as it is not guaranteed in tests that the
     // destructor will be called.
     GetSurfaceManager()->UnregisterSurfaceFactoryClient(
-        id_allocator_->id_namespace());
+        id_allocator_->client_id());
 
-    parent_surface_id_namespace_ = 0;
+    parent_surface_client_id_ = 0;
   }
   frame_connector_ = frame_connector;
   if (frame_connector_) {
     GetSurfaceManager()->RegisterSurfaceFactoryClient(
-        id_allocator_->id_namespace(), this);
+        id_allocator_->client_id(), this);
     RenderWidgetHostViewBase* parent_view =
         frame_connector_->GetParentRenderWidgetHostView();
     if (parent_view) {
-      parent_surface_id_namespace_ = parent_view->GetSurfaceIdNamespace();
-      DCHECK_NE(parent_surface_id_namespace_, 0u);
+      parent_surface_client_id_ = parent_view->GetSurfaceClientId();
+      DCHECK_NE(parent_surface_client_id_, 0u);
       GetSurfaceManager()->RegisterSurfaceNamespaceHierarchy(
-          parent_surface_id_namespace_, GetSurfaceIdNamespace());
+          parent_surface_client_id_, GetSurfaceClientId());
     }
   }
 }
 
 void RenderWidgetHostViewChildFrame::InitAsChild(
     gfx::NativeView parent_view) {
   NOTREACHED();
 }
 
 bool RenderWidgetHostViewChildFrame::OnMessageReceived(
@@ skipping 159 matching lines @@
 
 void RenderWidgetHostViewChildFrame::RenderProcessGone(
     base::TerminationStatus status,
     int error_code) {
   if (frame_connector_)
     frame_connector_->RenderProcessGone();
   Destroy();
 }
 
 void RenderWidgetHostViewChildFrame::Destroy() {
-  // SurfaceIdNamespaces registered with RenderWidgetHostInputEventRouter
+  // SurfaceClientIds registered with RenderWidgetHostInputEventRouter
   // have already been cleared when RenderWidgetHostViewBase notified its
   // observers of our impending destruction.
   if (frame_connector_) {
     frame_connector_->set_view(nullptr);
     SetCrossProcessFrameConnector(nullptr);
   }
 
   // We notify our observers about shutdown here since we are about to release
   // host_ and do not want any event calls coming from
   // RenderWidgetHostInputEventRouter afterwards.
@@ skipping 21 matching lines @@
 
 void RenderWidgetHostViewChildFrame::UnlockCompositingSurface() {
   NOTIMPLEMENTED();
 }
 
 void RenderWidgetHostViewChildFrame::RegisterSurfaceNamespaceId() {
   // If Destroy() has been called before we get here, host_ may be null.
   if (host_ && host_->delegate() && host_->delegate()->GetInputEventRouter()) {
     RenderWidgetHostInputEventRouter* router =
         host_->delegate()->GetInputEventRouter();
-    if (!router->is_registered(GetSurfaceIdNamespace()))
-      router->AddSurfaceIdNamespaceOwner(GetSurfaceIdNamespace(), this);
+    if (!router->is_registered(GetSurfaceClientId()))
+      router->AddSurfaceClientIdOwner(GetSurfaceClientId(), this);
   }
 }
 
 void RenderWidgetHostViewChildFrame::UnregisterSurfaceNamespaceId() {
   DCHECK(host_);
   if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
-    host_->delegate()->GetInputEventRouter()->RemoveSurfaceIdNamespaceOwner(
-        GetSurfaceIdNamespace());
+    host_->delegate()->GetInputEventRouter()->RemoveSurfaceClientIdOwner(
+        GetSurfaceClientId());
   }
 }
 
 void RenderWidgetHostViewChildFrame::GestureEventAck(
     const blink::WebGestureEvent& event,
     InputEventAckState ack_result) {
   bool not_consumed = ack_result == INPUT_EVENT_ACK_STATE_NOT_CONSUMED ||
                       ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
   // GestureScrollBegin is consumed by the target frame and not forwarded,
   // because we don't know whether we will need to bubble scroll until we
@@ skipping 58 matching lines @@
   if (!surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
     surface_factory_ = base::WrapUnique(new cc::SurfaceFactory(manager, this));
   }
 
   if (surface_id_.is_null()) {
     surface_id_ = id_allocator_->GenerateId();
     surface_factory_->Create(surface_id_);
 
     cc::SurfaceSequence sequence = cc::SurfaceSequence(
-        id_allocator_->id_namespace(), next_surface_sequence_++);
+        id_allocator_->client_id(), next_surface_sequence_++);
     // The renderer process will satisfy this dependency when it creates a
     // SurfaceLayer.
     cc::SurfaceManager* manager = GetSurfaceManager();
     manager->GetSurfaceForId(surface_id_)->AddDestructionDependency(sequence);
     frame_connector_->SetChildFrameSurface(surface_id_, frame_size,
                                            scale_factor, sequence);
   }
 
   cc::SurfaceFactory::DrawCallback ack_callback =
       base::Bind(&RenderWidgetHostViewChildFrame::SurfaceDrawn, AsWeakPtr(),
@@ skipping 60 matching lines @@
 
   RenderWidgetHostViewBase* root_view =
       frame_connector_->GetRootRenderWidgetHostView();
 
   if (root_view)
     return root_view->IsMouseLocked();
 
   return false;
 }
 
-uint32_t RenderWidgetHostViewChildFrame::GetSurfaceIdNamespace() {
-  return id_allocator_->id_namespace();
+uint32_t RenderWidgetHostViewChildFrame::GetSurfaceClientId() {
+  return id_allocator_->client_id();
 }
 
 void RenderWidgetHostViewChildFrame::ProcessKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   host_->ForwardKeyboardEvent(event);
 }
 
 void RenderWidgetHostViewChildFrame::ProcessMouseEvent(
     const blink::WebMouseEvent& event,
     const ui::LatencyInfo& latency) {
@@ skipping 189 matching lines @@
 
 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const {
   return true;
 }
 
 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
   return surface_id_;
 };
 
 }  // namespace content