Revert of Separate RenderView from RenderWidget, part 1: inheritance.

content/renderer/npapi/webplugin_delegate_proxy.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/npapi/webplugin_delegate_proxy.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 123 matching lines @@
 void WebPluginDelegateProxy::PluginDestroyed() {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // Ensure that the renderer doesn't think the plugin still has focus.
   if (render_view_)
     render_view_->PluginFocusChanged(false, instance_id_);
 #endif
 
 #if defined(OS_WIN)
   if (dummy_activation_window_ && render_view_) {
     render_view_->Send(new ViewHostMsg_WindowlessPluginDummyWindowDestroyed(
-        render_view_->GetRoutingID(), dummy_activation_window_));
+        render_view_->routing_id(), dummy_activation_window_));
   }
   dummy_activation_window_ = NULL;
 #endif
 
   if (window_)
     WillDestroyWindow();
 
   if (render_view_.get())
     render_view_->UnregisterPluginDelegate(this);
 
@@ skipping 106 matching lines @@
   // Inform the channel of the mapping between our instance-Id and dummy NPP
   // identifier, for use in object ownership tracking.
   channel_host_->AddMappingForNPObjectOwner(instance_id_, GetPluginNPP());
 
   // Now tell the PluginInstance in the plugin process to initialize.
   PluginMsg_Init_Params params;
   params.url = url;
   params.page_url = page_url_;
   params.arg_names = arg_names;
   params.arg_values = arg_values;
-  params.host_render_view_routing_id = render_view_->GetRoutingID();
+  params.host_render_view_routing_id = render_view_->routing_id();
   params.load_manually = load_manually;
 
   result = false;
   Send(new PluginMsg_Init(instance_id_, params, &transparent_, &result));
 
   if (!result)
     LOG(WARNING) << "PluginMsg_Init returned false";
 
   render_view_->RegisterPluginDelegate(this);
 
@@ skipping 391 matching lines @@
                                                    window_has_focus);
   // Make sure focus events are delivered in the right order relative to
   // sync messages they might interact with (Paint, HandleEvent, etc.).
   msg->set_unblock(true);
   Send(msg);
 }
 
 void WebPluginDelegateProxy::SetContainerVisibility(bool is_visible) {
   IPC::Message* msg;
   if (is_visible) {
-    gfx::Rect window_frame = render_view_->GetWidget()->rootWindowRect();
-    gfx::Rect view_frame = render_view_->GetWidget()->windowRect();
+    gfx::Rect window_frame = render_view_->rootWindowRect();
+    gfx::Rect view_frame = render_view_->windowRect();
     blink::WebView* webview = render_view_->webview();
     msg = new PluginMsg_ContainerShown(instance_id_, window_frame, view_frame,
                                        webview && webview->isActive());
   } else {
     msg = new PluginMsg_ContainerHidden(instance_id_);
   }
   // Make sure visibility events are delivered in the right order relative to
   // sync messages they might interact with (Paint, HandleEvent, etc.).
   msg->set_unblock(true);
   Send(msg);
@@ skipping 44 matching lines @@
 void WebPluginDelegateProxy::OnSetWindowlessData(
       HANDLE modal_loop_pump_messages_event_handle,
       gfx::NativeViewId dummy_activation_window) {
   DCHECK(!modal_loop_pump_messages_event_.get());
   DCHECK(!dummy_activation_window_);
   base::win::ScopedHandle modal_loop_pump_messages_event(
       modal_loop_pump_messages_event_handle);
 
   dummy_activation_window_ = dummy_activation_window;
   render_view_->Send(new ViewHostMsg_WindowlessPluginDummyWindowCreated(
-      render_view_->GetRoutingID(), dummy_activation_window_));
+      render_view_->routing_id(), dummy_activation_window_));
 
   // Bug 25583: this can be null because some "virus scanners" block the
   // DuplicateHandle call in the plugin process.
   if (!modal_loop_pump_messages_event.IsValid())
     return;
 
   modal_loop_pump_messages_event_.reset(
       new base::WaitableEvent(modal_loop_pump_messages_event.Pass()));
 }
 
 void WebPluginDelegateProxy::OnNotifyIMEStatus(int input_type,
                                                const gfx::Rect& caret_rect) {
   if (!render_view_)
     return;
 
   ViewHostMsg_TextInputState_Params params;
   params.type = static_cast<ui::TextInputType>(input_type);
   params.mode = ui::TEXT_INPUT_MODE_DEFAULT;
   params.can_compose_inline = true;
   render_view_->Send(new ViewHostMsg_TextInputStateChanged(
-      render_view_->GetRoutingID(), params));
+      render_view_->routing_id(), params));
 
   ViewHostMsg_SelectionBounds_Params bounds_params;
   bounds_params.anchor_rect = bounds_params.focus_rect = caret_rect;
   bounds_params.anchor_dir = bounds_params.focus_dir =
       blink::WebTextDirectionLeftToRight;
   bounds_params.is_anchor_first = true;
   render_view_->Send(new ViewHostMsg_SelectionBoundsChanged(
-      render_view_->GetRoutingID(), bounds_params));
+      render_view_->routing_id(),
+      bounds_params));
 }
 #endif
 
 void WebPluginDelegateProxy::OnInvalidateRect(const gfx::Rect& rect) {
   if (!plugin_)
     return;
 
   // Clip the invalidation rect to the plugin bounds; the plugin may have been
   // resized since the invalidate message was sent.
   gfx::Rect clipped_rect =
@@ skipping 184 matching lines @@
         index->mime_type == "application/x-vnd.movenetworks.qm" ||
         index->mime_type == "application/x-vnd.mnplayer.qm") {
       return true;
     }
   }
   return false;
 }
 #endif
 
 }  // namespace content