Browser Plugin: browser process side changes

content/browser/renderer_host/render_view_host_impl.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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 12 matching lines @@
 #endif
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/host_zoom_map_impl.h"
 #include "content/browser/power_save_blocker.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/accessibility_messages.h"
+#include "content/common/browser_plugin_messages.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/drag_messages.h"
 #include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/speech_recognition_messages.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_message_filter.h"
@@ skipping 55 matching lines @@
 
 }  // namespace
 
 namespace content {
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHost, public:
 
 // static
 RenderViewHost* RenderViewHost::FromID(int render_process_id,
-                                       int render_view_id) {
+                                      int render_view_id) {
   RenderProcessHost* process = RenderProcessHost::FromID(render_process_id);
   if (!process)
     return NULL;
   RenderWidgetHost* widget = process->GetRenderWidgetHostByID(render_view_id);
   if (!widget || !widget->IsRenderView())
     return NULL;
   return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget));
 }
 
 // static
 RenderViewHost* RenderViewHost::From(RenderWidgetHost* rwh) {
   return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(rwh));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHostImpl, public:
 
 // static
 RenderViewHostImpl* RenderViewHostImpl::FromID(int render_process_id,
-                                               int render_view_id) {
+                                              int render_view_id) {

[Charlie Reis, 2012/05/18 20:35:24]

Wrong indent.

[Fady Samuel, 2012/05/21 14:30:17]

Done.

   return static_cast<RenderViewHostImpl*>(
       RenderViewHost::FromID(render_process_id, render_view_id));
 }
 
 RenderViewHostImpl::RenderViewHostImpl(
     SiteInstance* instance,
     RenderViewHostDelegate* delegate,
     RenderWidgetHostDelegate* widget_delegate,
     int routing_id,
     bool swapped_out,
@@ skipping 111 matching lines @@
   } else {
     content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
         &params.screen_info);
   }
 #else
   params.screen_info =
       WebKit::WebScreenInfoFactory::screenInfo(
           gfx::NativeViewFromId(GetNativeViewId()));
 #endif
 
-  if (embedder_process_id != -1)
+  if (embedder_process_id != -1) {
     params.embedder_channel_name =
         StringPrintf("%d.r%d", GetProcess()->GetID(), embedder_process_id);
+  }
 
   params.accessibility_mode =
       BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ?
           AccessibilityModeComplete :
           AccessibilityModeOff;
 
 #if defined(OS_WIN)
   // On Windows 8, always enable accessibility for editable text controls
   // so we can show the virtual keyboard when one is enabled.
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
@@ skipping 633 matching lines @@
     IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_Cancel,
                         OnCancelDesktopNotification)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnMsgShowPopup)
 #endif
     IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse,
                         OnDomOperationResponse)
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Notifications,
                         OnAccessibilityNotifications)
+    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_ResizeGuest, OnResizeGuest)
+    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_NavigateFromEmbedder,
+                        OnNavigateGuestFromEmbedder)
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(
         handled = RenderWidgetHostImpl::OnMessageReceived(msg))
   IPC_END_MESSAGE_MAP_EX()
 
   if (!msg_is_ok) {
     // The message had a handler, but its de-serialization failed.
     // Kill the renderer.
     content::RecordAction(UserMetricsAction("BadMessageTerminate_RVH"));
     GetProcess()->ReceivedBadMessage();
@@ skipping 887 matching lines @@
 
 void RenderViewHostImpl::OnDomOperationResponse(
     const std::string& json_string, int automation_id) {
   DomOperationNotificationDetails details(json_string, automation_id);
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_DOM_OPERATION_RESPONSE,
       content::Source<RenderViewHost>(this),
       content::Details<DomOperationNotificationDetails>(&details));
 }
 
+void RenderViewHostImpl::OnResizeGuest(int width, int height) {
+  DCHECK(GetView());
+  GetView()->SetSize(gfx::Size(width, height));
+}
+
+void RenderViewHostImpl::OnNavigateGuestFromEmbedder(int32 instance_id,
+                                                     long long frame_id,
+                                                     const std::string& src,
+                                                     const gfx::Size& size) {
+

[Charlie Reis, 2012/05/18 20:35:24]

Remove blank line.

[Fady Samuel, 2012/05/21 14:30:17]

Done.

+  delegate_->NavigateGuestFromEmbedder(
+      this,
+      instance_id,
+      frame_id,
+      src,
+      size);
+}
+
 void RenderViewHostImpl::SetSwappedOut(bool is_swapped_out) {
   is_swapped_out_ = is_swapped_out;
 
   // Whenever we change swap out state, we should not be waiting for
   // beforeunload or unload acks.  We clear them here to be safe, since they
   // can cause navigations to be ignored in OnMsgNavigate.
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
 }
 
 void RenderViewHostImpl::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }
 
 }  // namespace content