Browser Plugin: Implement getProcessId

content/browser/browser_plugin/browser_plugin_guest.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/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "content/browser/browser_plugin/browser_plugin_guest_helper.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
@@ skipping 111 matching lines @@
       size_t guest_damage_buffer_size = dib->size();
       size_t embedder_damage_buffer_size = damage_buffer_->size();
 #endif
       void* guest_memory = dib->memory();
       void* embedder_memory = damage_buffer_->memory();
       size_t size = std::min(guest_damage_buffer_size,
                              embedder_damage_buffer_size);
       memcpy(embedder_memory, guest_memory, size);
     }
   }
-  DCHECK(embedder_render_process_host());
   BrowserPluginMsg_UpdateRect_Params relay_params;
   relay_params.bitmap_rect = params.bitmap_rect;
   relay_params.dx = params.dx;
   relay_params.dy = params.dy;
   relay_params.scroll_rect = params.scroll_rect;
   relay_params.copy_rects = params.copy_rects;
   relay_params.view_size = params.view_size;
   relay_params.scale_factor = params.scale_factor;
   relay_params.is_resize_ack = ViewHostMsg_UpdateRect_Flags::is_resize_ack(
       params.flags);
@@ skipping 48 matching lines @@
   // TODO(fsamuel): What do we need to do here? This is for keyboard shortcuts.
   if (input_event->type == WebKit::WebInputEvent::RawKeyDown)
     message->WriteBool(false);
   bool sent = guest_rvh->Send(message);
   if (!sent) {
     // If the embedder is waiting for a previous input ack, a new input message
     // won't get sent to the guest. Reply immediately with handled = false so
     // embedder doesn't hang.
     BrowserPluginHostMsg_HandleInputEvent::WriteReplyParams(
         reply_message, false /* handled */, cursor_);
-    embedder_render_process_host()->Send(reply_message);
+    SendMessageToEmbedder(reply_message);
     return;
   }
 
   pending_input_event_reply_.reset(reply_message);
   // Input events are handled synchronously, meaning it blocks the embedder. We
   // set a hang monitor here that will kill the guest process (5s timeout) if we
   // don't receive an ack. This will kill all the guests that are running in the
   // same process (undesired behavior).
   // TODO(fsamuel,lazyboy): Find a way to get rid of guest process kill
   // behavior. http://crbug.com/147272.
@@ skipping 43 matching lines @@
   cursor_ = cursor;
 }
 
 void BrowserPluginGuest::DidCommitProvisionalLoadForFrame(
     int64 frame_id,
     bool is_main_frame,
     const GURL& url,
     PageTransition transition_type,
     RenderViewHost* render_view_host) {
   // Inform its embedder of the updated URL.
-  DCHECK(embedder_render_process_host());
   if (is_main_frame)
-    SendMessageToEmbedder(new BrowserPluginMsg_DidNavigate(instance_id(), url));
+    SendMessageToEmbedder(
+        new BrowserPluginMsg_DidNavigate(
+            instance_id(),
+            url,
+            render_view_host->GetProcess()->GetID()));
 }
 
 void BrowserPluginGuest::RenderViewGone(base::TerminationStatus status) {
-  DCHECK(embedder_render_process_host());
   if (pending_input_event_reply_.get()) {
     IPC::Message* reply_message = pending_input_event_reply_.release();
     BrowserPluginHostMsg_HandleInputEvent::WriteReplyParams(reply_message,
                                                             false,
                                                             cursor_);
     SendMessageToEmbedder(reply_message);
   }
   SendMessageToEmbedder(new BrowserPluginMsg_GuestCrashed(instance_id()));
   IDMap<RenderViewHost>::const_iterator iter(&pending_updates_);
   while (!iter.IsAtEnd()) {
     pending_updates_.Remove(iter.GetCurrentKey());
     iter.Advance();
   }
 }
 
 void BrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
+  DCHECK(embedder_render_process_host());
   embedder_render_process_host()->Send(msg);
 }
 
 }  // namespace content