POSIX: gfx::NativeViewId and CrossProcessEvent

chrome/renderer/render_view.cc

 // Copyright (c) 2006-2008 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/gfx/png_encoder.h"
+#include "base/gfx/native_widget_types.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/page_zoom.h"
@@ skipping 180 matching lines @@
 
 #ifdef CHROME_PERSONALIZATION
   Personalization::CleanupRendererPersonalization(personalization_);
   personalization_ = NULL;
 #endif
 }
 
 /*static*/
 RenderView* RenderView::Create(
     RenderThreadBase* render_thread,
-    HWND parent_hwnd,
+    gfx::NativeViewId parent_hwnd,
     base::WaitableEvent* modal_dialog_event,
     int32 opener_id,
     const WebPreferences& webkit_prefs,
     SharedRenderViewCounter* counter,
     int32 routing_id) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
   scoped_refptr<RenderView> view = new RenderView(render_thread);
   view->Init(parent_hwnd,
              modal_dialog_event,
              opener_id,
@@ skipping 35 matching lines @@
 
 void RenderView::PluginCrashed(const FilePath& plugin_path) {
   Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path));
 }
 
 
 void RenderView::JSOutOfMemory() {
   Send(new ViewHostMsg_JSOutOfMemory(routing_id_));
 }
 
-void RenderView::Init(HWND parent_hwnd,
+void RenderView::Init(gfx::NativeViewId parent_hwnd,
                       base::WaitableEvent* modal_dialog_event,
                       int32 opener_id,
                       const WebPreferences& webkit_prefs,
                       SharedRenderViewCounter* counter,
                       int32 routing_id) {
   DCHECK(!webview());
 
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
@@ skipping 138 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_PopupNotificationVisiblityChanged,
                         OnPopupNotificationVisiblityChanged)
 
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(RenderWidget::OnMessageReceived(message))
   IPC_END_MESSAGE_MAP()
 }
 
 // Got a response from the browser after the renderer decided to create a new
 // view.
-void RenderView::OnCreatingNewAck
-#if defined(OS_WIN)
-    (HWND parent) {
+void RenderView::OnCreatingNewAck(gfx::NativeViewId parent) {
   CompleteInit(parent);
-#else
-    () {
-#endif
-
   waiting_for_create_window_ack_ = false;
 
   while (!queued_resource_messages_.empty()) {
     IPC::Message* queued_msg = queued_resource_messages_.front();
     queued_resource_messages_.pop();
     resource_dispatcher_->OnMessageReceived(*queued_msg);
     delete queued_msg;
   }
 }
 
@@ skipping 1401 matching lines @@
   // Check to make sure we aren't overloading on popups.
   if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups)
     return NULL;
 
   // This window can't be closed from a window.close() call until we receive a
   // message from the Browser process explicitly allowing it.
   popup_notification_visible_ = true;
 
   int32 routing_id = MSG_ROUTING_NONE;
 
-#if defined(OS_WIN)
-  HANDLE modal_dialog_event = NULL;
+  ModalDialogEvent modal_dialog_event;
   render_thread_->Send(
       new ViewHostMsg_CreateWindow(routing_id_, user_gesture, &routing_id,
                                    &modal_dialog_event));
   if (routing_id == MSG_ROUTING_NONE) {
-    DCHECK(modal_dialog_event == NULL);
     return NULL;
   }
-#else  // defined(OS_WIN)
-  // On POSIX we don't have a HANDLE parameter as we don't have cross process
-  // events. All platforms should be ported across to this at some point.
-  render_thread_->Send(
-      new ViewHostMsg_CreateWindow(routing_id_, user_gesture, &routing_id));
-  if (routing_id == MSG_ROUTING_NONE)
-    return NULL;
-#endif
 
   // The WebView holds a reference to this new RenderView
   const WebPreferences& prefs = webview->GetPreferences();
   base::WaitableEvent* waitable_event = new base::WaitableEvent
 #if defined(OS_WIN)
-      (modal_dialog_event);
+      (modal_dialog_event.event);
 #else
       (true, false);
 #endif
   RenderView* view = RenderView::Create(render_thread_,
                                         NULL, waitable_event, routing_id_,
                                         prefs, shared_popup_counter_,
                                         routing_id);
   view->set_opened_by_user_gesture(user_gesture);
   view->set_waiting_for_create_window_ack(true);
 
@@ skipping 49 matching lines @@
 
     std::string mime_type_to_use;
     if (actual_mime_type && !actual_mime_type->empty())
       mime_type_to_use = *actual_mime_type;
     else
       mime_type_to_use = mime_type;
 
     if (is_gears)
       ChromePluginLib::Create(path, GetCPBrowserFuncsForRenderer());
     return WebPluginDelegateImpl::Create(path,
-                                         mime_type_to_use, host_window_);
+                                         mime_type_to_use,
+                                         gfx::NativeViewFromId(host_window_));
   }
 
   WebPluginDelegateProxy* proxy =
       WebPluginDelegateProxy::Create(url, mime_type, clsid, this);
   if (!proxy)
     return NULL;
 
   // We hold onto the proxy so we can poke it when we are painting.  See our
   // DidPaint implementation below.
   plugin_delegates_.push_back(proxy);
@@ skipping 937 matching lines @@
           template_resource_id));
 
   if (template_html.empty()) {
     NOTREACHED() << "unable to load template. ID: " << template_resource_id;
     return "";
   }
   // "t" is the id of the templates root node.
   return jstemplate_builder::GetTemplateHtml(
       template_html, &error_strings, "t");
 }