Pass Surface ID namespace to renderer compositors.

content/renderer/render_widget.cc

 // Copyright (c) 2012 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/render_widget.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 549 matching lines @@
       blink::WebPopupTypeNone, screen_info, false, hidden, false));
   widget->routing_id_ = routing_id;
   widget->surface_id_ = surface_id;
   widget->compositor_deps_ = compositor_deps;
   widget->for_oopif_ = true;
   // DoInit increments the reference count on |widget|, keeping it alive after
   // this function returns.
   if (widget->DoInit(MSG_ROUTING_NONE, compositor_deps,
                      RenderWidget::CreateWebFrameWidget(widget.get(), frame),
                      nullptr)) {
-    widget->CompleteInit();
+    // TODO(kenrb): Child frames need support for Surface IDs.
+    widget->CompleteInit(0);
     return widget.get();
   }
   return nullptr;
 }
 
 // static
 blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) {
   switch (render_widget->popup_type_) {
     case blink::WebPopupTypeNone:  // Nothing to create.
       break;
@@ skipping 49 matching lines @@
         RenderThreadImpl::current()->WidgetHidden();
     }
     return true;
   } else {
     // The above Send can fail when the tab is closing.
     return false;
   }
 }
 
 // This is used to complete pending inits and non-pending inits.
-void RenderWidget::CompleteInit() {
+void RenderWidget::CompleteInit(uint32_t surface_id_namespace) {
   DCHECK(routing_id_ != MSG_ROUTING_NONE);
 
   init_complete_ = true;
 
-  if (compositor_)
+  if (compositor_) {
     StartCompositor();
+    compositor_->SetSurfaceIdNamespace(surface_id_namespace);
+  }
 
   Send(new ViewHostMsg_RenderViewReady(routing_id_));
 }
 
 void RenderWidget::SetSwappedOut(bool is_swapped_out) {
   // We should only toggle between states.
   DCHECK(is_swapped_out_ != is_swapped_out);
   is_swapped_out_ = is_swapped_out;
 
   // If we are swapping out, we will call ReleaseProcess, allowing the process
@@ skipping 85 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_WasShown, OnWasShown)
     IPC_MESSAGE_HANDLER(ViewMsg_SetInputMethodActive, OnSetInputMethodActive)
     IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowShown, OnCandidateWindowShown)
     IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowUpdated,
                         OnCandidateWindowUpdated)
     IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowHidden, OnCandidateWindowHidden)
     IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint)
     IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection)
     IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateScreenRects, OnUpdateScreenRects)
+    IPC_MESSAGE_HANDLER(ViewMsg_UpdateSurfaceIdNamespace,
+                        OnUpdateSurfaceIdNamespace)
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ViewMsg_ShowImeIfNeeded, OnShowImeIfNeeded)
     IPC_MESSAGE_HANDLER(ViewMsg_ImeEventAck, OnImeEventAck)
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 bool RenderWidget::Send(IPC::Message* message) {
@@ skipping 121 matching lines @@
   // loops.
   RenderThread::Get()->GetTaskRunner()->PostNonNestableTask(
       FROM_HERE, base::Bind(&RenderWidget::Close, this));
 
   // Balances the AddRef taken when we called AddRoute.
   Release();
 }
 
 // Got a response from the browser after the renderer decided to create a new
 // view.
-void RenderWidget::OnCreatingNewAck() {
+void RenderWidget::OnCreatingNewAck(uint32_t surface_id_namespace) {
   DCHECK(routing_id_ != MSG_ROUTING_NONE);
 
-  CompleteInit();
+  CompleteInit(surface_id_namespace);
 }
 
 void RenderWidget::OnResize(const ViewMsg_Resize_Params& params) {
   if (resizing_mode_selector_->ShouldAbortOnResize(this, params))
     return;
 
   if (screen_metrics_emulator_) {
     screen_metrics_emulator_->OnResizeMessage(params);
     return;
   }
@@ skipping 835 matching lines @@
   if (screen_metrics_emulator_) {
     screen_metrics_emulator_->OnUpdateScreenRectsMessage(
         view_screen_rect, window_screen_rect);
   } else {
     view_screen_rect_ = view_screen_rect;
     window_screen_rect_ = window_screen_rect;
   }
   Send(new ViewHostMsg_UpdateScreenRects_ACK(routing_id()));
 }
 
+void RenderWidget::OnUpdateSurfaceIdNamespace(uint32 surface_id_namespace) {
+  if (compositor_)
+    compositor_->SetSurfaceIdNamespace(surface_id_namespace);
+}
+
 void RenderWidget::showImeIfNeeded() {
   OnShowImeIfNeeded();
 }
 
 void RenderWidget::OnShowImeIfNeeded() {
 #if defined(OS_ANDROID) || defined(USE_AURA)
   UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME);
 #endif
 
 // TODO(rouslan): Fix ChromeOS and Windows 8 behavior of autofill popup with
@@ skipping 678 matching lines @@
 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) {
   video_hole_frames_.AddObserver(frame);
 }
 
 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) {
   video_hole_frames_.RemoveObserver(frame);
 }
 #endif  // defined(VIDEO_HOLE)
 
 }  // namespace content