Implement Mac Pop-up Dictionary for OOPIF.

content/renderer/text_input_client_observer.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.
 
 #ifndef CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_
 #define CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/range/range.h"
 
 namespace blink {
 class WebView;
 }
 
 namespace content {
 
-class RenderViewImpl;
+class RenderFrameImpl;
+class RenderWidget;
 
 // This is the renderer-side message filter that generates the replies for the
 // messages sent by the TextInputClientMac. See
 // content/browser/renderer_host/text_input_client_mac.h for more information.
-class TextInputClientObserver : public RenderViewObserver {
+class TextInputClientObserver : public IPC::Listener, public IPC::Sender {
  public:
-  explicit TextInputClientObserver(RenderViewImpl* render_view);
+  explicit TextInputClientObserver(RenderFrameImpl* render_frame);
   ~TextInputClientObserver() override;
 
   // RenderViewObserver overrides:

[Charlie Reis, 2016/09/02 21:57:47]

Stale comment.  (These now override from somewhere else.)

[EhsanK, 2016/09/08 17:10:40]

Done.

   bool OnMessageReceived(const IPC::Message& message) override;
 
+  bool Send(IPC::Message* message) override;
+
  private:
-  // RenderViewObserver implementation.
-  void OnDestruct() override;
+  // The render widget corresponding to the local root.

[Charlie Reis, 2016/09/02 21:57:47]

This confuses me a bit.  "Local root" refers to a specific frame within a
widget, so it seems backwards to refer to a widget in terms of a local root.

[EhsanK, 2016/09/08 17:10:40]

Acknowledged. I think I meant the RenderFramImpl with the |render_widget_|
equaling |this|.

+  RenderWidget* GetRenderWidget();
 
   // Returns the WebView of the RenderView.

[Charlie Reis, 2016/09/02 21:57:48]

Should this still mention RenderView?

[EhsanK, 2016/09/08 17:10:40]

No I don't think it should.

-  blink::WebView* webview();
+  blink::WebView* GetWebView();
+
+  // The routing ID of the RenderWidget.
+  int32_t GetRoutingID();
 
   // IPC Message handlers:
   void OnStringAtPoint(gfx::Point point);
   void OnCharacterIndexForPoint(gfx::Point point);
   void OnFirstRectForCharacterRange(gfx::Range range);
   void OnStringForRange(gfx::Range range);
 
-#if defined(ENABLE_PLUGINS)
-  RenderViewImpl* const render_view_impl_;
-#endif
+  // RenderFrameImpl owning this instance of the observer.
+  RenderFrameImpl* render_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(TextInputClientObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_