Browser Plugin: Move input to RWHVGuest to support interstitial pages

content/browser/browser_plugin/browser_plugin_guest.h

 // 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.
 
 // A BrowserPluginGuest is the browser side of a browser <--> embedder
 // renderer channel. A BrowserPlugin (a WebPlugin) is on the embedder
 // renderer side of browser <--> embedder renderer communication.
 //
 // BrowserPluginGuest lives on the UI thread of the browser process. Any
 // messages about the guest render process that the embedder might be interested
 // in receiving should be listened for here.
 //
 // BrowserPluginGuest is a WebContentsObserver for the guest WebContents.
 // BrowserPluginGuest operates under the assumption that the guest will be
 // accessible through only one RenderViewHost for the lifetime of
 // the guest WebContents. Thus, cross-process navigation is not supported.
 
 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_
 #define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_
 
 #include <map>
 #include <queue>
 
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 #include "third_party/WebKit/public/web/WebDragStatus.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
@@ skipping 82 matching lines @@
   // as the |opener|.
   WebContentsImpl* CreateNewGuestWindow(
       const WebContents::CreateParams& params);
 
   // Returns the identifier that uniquely identifies a browser plugin guest
   // within an embedder.
   int browser_plugin_instance_id() const { return browser_plugin_instance_id_; }
 
   bool OnMessageReceivedFromEmbedder(const IPC::Message& message);
 
-  WebContentsImpl* embedder_web_contents() const {
+  // TODO(fsamuel): This is a non-trivial accessor because it converts a

[Charlie Reis, 2014/09/09 21:22:14]

I guess I'm missing the relevant detail-- how does the conversion make it
non-trivial?  Isn't that just an upcast?

If it is just an upcast, I also don't see why the change was needed.

[Charlie Reis, 2014/09/10 00:28:21]

One part of my question was about the TODO, which I don't think is necessary. 
It's still trivial and can remain inlined.
Thanks for the explanation, but let's avoid the change of return type if we can.
 One suggestion below.

[Fady Samuel, 2014/09/10 02:51:37]

Done.

[Fady Samuel, 2014/09/10 02:51:37]

Done.

+  // WebContentsImpl into a WebContents. We should rename this and move the
+  // implementation to the cc file.
+  WebContents* embedder_web_contents() const {
     return embedder_web_contents_;
   }
 
   // Returns the embedder's RenderWidgetHostView if it is available.
   // Returns NULL otherwise.
   RenderWidgetHostView* GetEmbedderRenderWidgetHostView();
 
   bool focused() const { return focused_; }
   bool visible() const { return guest_visible_; }
   bool is_in_destruction() { return is_in_destruction_; }
@@ skipping 97 matching lines @@
                           const gfx::Point& location);
   // Instructs the guest to execute an edit command decoded in the embedder.
   void OnExecuteEditCommand(int instance_id,
                             const std::string& command);
 
   // Returns compositor resources reclaimed in the embedder to the guest.
   void OnReclaimCompositorResources(
       int instance_id,
       const FrameHostMsg_ReclaimCompositorResources_Params& params);
 
-  void OnHandleInputEvent(int instance_id,
-                                  const gfx::Rect& guest_window_rect,
-                                  const blink::WebInputEvent* event);
   void OnLockMouse(bool user_gesture,
                    bool last_unlocked_by_target,
                    bool privileged);
   void OnLockMouseAck(int instance_id, bool succeeded);
   void OnPluginDestroyed(int instance_id);
   // Resizes the guest's web contents.
   void OnResizeGuest(
       int instance_id, const BrowserPluginHostMsg_ResizeGuest_Params& params);
   void OnSetFocus(int instance_id, bool focused);
   // Sets the name of the guest so that other guests in the same partition can
@@ skipping 117 matching lines @@
   // Weak pointer used to ask GeolocationPermissionContext about geolocation
   // permission.
   base::WeakPtrFactory<BrowserPluginGuest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_