Introduce RenderView::Observer interface so that RenderView doesn't have to k...

chrome/renderer/render_view.h

 // Copyright (c) 2011 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 CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 17 matching lines @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/view_types.h"
 #include "chrome/renderer/external_popup_menu.h"
 #include "chrome/renderer/page_load_histograms.h"
 #include "chrome/renderer/pepper_plugin_delegate_impl.h"
 #include "chrome/renderer/render_widget.h"
 #include "chrome/renderer/renderer_webcookiejar_impl.h"
 #include "chrome/renderer/searchbox.h"
 #include "chrome/renderer/translate_helper.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebAutoFillClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPageSerializerClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNavigationType.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 
 #if defined(OS_WIN)
 // RenderView is a diamond-shaped hierarchy, with WebWidgetClient at the root.
 // VS warns when we inherit the WebWidgetClient method implementations from
 // RenderWidget.  It's safe to ignore that warning.
 #pragma warning(disable: 4250)
 #endif
 
 class AudioMessageFilter;
-class AutoFillHelper;
 class BlockedPlugin;
 class CustomMenuListener;
 class DictionaryValue;
 class DeviceOrientationDispatcher;
 class DevToolsAgent;
 class DevToolsClient;
 class DomAutomationController;
 class DOMUIBindings;
 class ExternalHostBindings;
 class FilePath;
 class GeolocationDispatcher;
 class GeolocationDispatcherOld;
 class GURL;
 class ListValue;
 class LoadProgressTracker;
 class NavigationState;
 class NotificationProvider;
-class PageClickTracker;
-class PasswordAutocompleteManager;
 class PepperDeviceTest;
 class PrintWebViewHelper;
 class RenderViewVisitor;
 class SkBitmap;
 class SpeechInputDispatcher;
 class WebPluginDelegatePepper;
 class WebPluginDelegateProxy;
 struct ContextMenuMediaParams;
 struct PP_Flash_NetAddress;
 struct ThumbnailScore;
@@ skipping 79 matching lines @@
 //
 // This is a RefCounted holder of an int because I can't say
 // scoped_refptr<int>.
 typedef base::RefCountedData<int> SharedRenderViewCounter;
 
 //
 // RenderView is an object that manages a WebView object, and provides a
 // communication interface with an embedding application process
 //
 class RenderView : public RenderWidget,
-                   public WebKit::WebAutoFillClient,
                    public WebKit::WebViewClient,
                    public WebKit::WebFrameClient,
                    public WebKit::WebPageSerializerClient,
                    public webkit::npapi::WebPluginPageDelegate,
                    public base::SupportsWeakPtr<RenderView> {
  public:
+  // Base class for objects that want to filter incoming IPCs, and also get
+  // notified of changes to the frame.
+  class Observer : public IPC::Channel::Listener,
+                   public IPC::Message::Sender {
+   public:
+    // By default, observers will be deleted when the RenderView goes away.  If
+    // they want to outlive it, they can override this function.
+    virtual void OnDestruct();
+
+    // These match the WebKit API notifications.
+    virtual void DidFinishDocumentLoad(WebKit::WebFrame* frame) {}
+    virtual void DidFinishLoad(WebKit::WebFrame* frame) {}
+    virtual void FrameDetached(WebKit::WebFrame* frame) {}
+    virtual void FrameWillClose(WebKit::WebFrame* frame) {}
+    virtual void FrameTranslated(WebKit::WebFrame* frame) {}
+
+   protected:
+    Observer();
+    virtual ~Observer();
+
+    // IPC::Channel::Listener implementation.
+    virtual bool OnMessageReceived(const IPC::Message& message);
+
+    // IPC::Message::Sender implementation.
+    virtual bool Send(IPC::Message* message);
+
+    // These getters are only available after the constructor runs.
+    RenderView* render_view() { return render_view_; }
+    int routing_id() { return routing_id_; }

[Ilya Sherman, 2011/01/13 02:18:30]

nit: please add a blank line below

[jam, 2011/01/13 02:53:43]

Done.

+   private:
+    friend class RenderView;
+
+    void SetRenderView(RenderView* render_view);
+
+    RenderView* render_view_;
+    // The routing ID of the associated RenderView.
+    int routing_id_;
+  };
+
   // Creates a new RenderView.  The parent_hwnd specifies a HWND to use as the
   // parent of the WebView HWND that will be created.  If this is a constrained
   // popup or as a new tab, opener_id is the routing ID of the RenderView
   // responsible for creating this RenderView (corresponding to parent_hwnd).
   // |counter| is either a currently initialized counter, or NULL (in which case
   // we treat this RenderView as a top level window).
   static RenderView* Create(
       RenderThreadBase* render_thread,
       gfx::NativeViewId parent_hwnd,
       int32 opener_id,
@@ skipping 38 matching lines @@
   }
 
   const WebPreferences& webkit_preferences() const {
     return webkit_preferences_;
   }
 
   void set_send_content_state_immediately(bool value) {
     send_content_state_immediately_ = value;
   }
 
-  PageClickTracker* page_click_tracker() const {
-    return page_click_tracker_.get();
-  }
-
   // May be NULL if client-side phishing detection is disabled.
   safe_browsing::PhishingClassifierDelegate*
       phishing_classifier_delegate() const {
     return phishing_delegate_.get();
   }
 
   // Returns true if we should display scrollbars for the given view size and
   // false if the scrollbars should be hidden.
   bool should_display_scrollbars(int width, int height) const {
     return (!send_preferred_size_changes_ ||
             (disable_scrollbars_size_limit_.width() <= width ||
              disable_scrollbars_size_limit_.height() <= height));
   }
 
   const SearchBox& searchbox() const {
     return search_box_;
   }
 
+  // Functions to add and remove observers for this object.
+  void AddObserver(Observer* observer);
+  void RemoveObserver(Observer* observer);
+
   // Called from JavaScript window.external.AddSearchProvider() to add a
   // keyword for a provider described in the given OpenSearch document.
   void AddSearchProvider(const std::string& url,
                          const ViewHostMsg_PageHasOSDD_Type& provider_type);
 
   // Returns the install state for the given search provider url.
   ViewHostMsg_GetSearchProviderInstallState_Params
       GetSearchProviderInstallState(WebKit::WebFrame* frame,
                                     const std::string& url);
 
@@ skipping 116 matching lines @@
   void RegisterPluginDelegate(WebPluginDelegateProxy* delegate);
   void UnregisterPluginDelegate(WebPluginDelegateProxy* delegate);
 
   void RegisterBlockedPlugin(BlockedPlugin* blocked_plugin);
   void UnregisterBlockedPlugin(BlockedPlugin* blocked_plugin);
 
   // IPC::Channel::Listener implementation -------------------------------------
 
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
-  // WebKit::WebAutoFillClient implementation ----------------------------------
-  virtual void didAcceptAutoFillSuggestion(const WebKit::WebNode& node,
-                                           const WebKit::WebString& value,
-                                           const WebKit::WebString& label,
-                                           int unique_id,
-                                           unsigned index);
-  virtual void didSelectAutoFillSuggestion(const WebKit::WebNode& node,
-                                           const WebKit::WebString& value,
-                                           const WebKit::WebString& label,
-                                           int unique_id);
-  virtual void didClearAutoFillSelection(const WebKit::WebNode& node);
-  virtual void didAcceptAutocompleteSuggestion(
-      const WebKit::WebInputElement& element);
-  virtual void removeAutocompleteSuggestion(const WebKit::WebString& name,
-                                           const WebKit::WebString& value);
-  // TODO(jam): remove this function after WebKit roll
-  virtual void removeAutofillSuggestions(const WebKit::WebString& name,
-                                         const WebKit::WebString& value);
-  virtual void textFieldDidEndEditing(const WebKit::WebInputElement& element);
-  virtual void textFieldDidChange(const WebKit::WebInputElement& element);
-  virtual void textFieldDidReceiveKeyDown(
-      const WebKit::WebInputElement& element,
-      const WebKit::WebKeyboardEvent& event);
-
   // WebKit::WebWidgetClient implementation ------------------------------------
 
   // Most methods are handled by RenderWidget.
   virtual void didFocus();
   virtual void didBlur();
   virtual void show(WebKit::WebNavigationPolicy policy);
   virtual void closeWidgetSoon();
   virtual void runModal();
 
   // WebKit::WebViewClient implementation --------------------------------------
@@ skipping 253 matching lines @@
   virtual void Close();
   virtual void OnResize(const gfx::Size& new_size,
                         const gfx::Rect& resizer_rect);
   virtual void DidInitiatePaint();
   virtual webkit::ppapi::PluginInstance* GetBitmapForOptimizedPluginPaint(
       const gfx::Rect& paint_bounds,
       TransportDIB** dib,
       gfx::Rect* location,
       gfx::Rect* clip);
   virtual void DidHandleKeyEvent();
-  virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event);
   virtual void OnSetFocus(bool enable);
 #if OS_MACOSX
   virtual void OnWasHidden();
   virtual void OnWasRestored(bool needs_repainting);
 #endif
 
  private:
   // For unit tests.
   friend class ExternalPopupMenuTest;
   friend class PepperDeviceTest;
@@ skipping 44 matching lines @@
     CONNECTION_ERROR,
   };
 
   RenderView(RenderThreadBase* render_thread,
              const WebPreferences& webkit_preferences,
              int64 session_storage_namespace_id);
 
   // Do not delete directly.  This class is reference counted.
   virtual ~RenderView();
 
-  // Initializes this view with the given parent and ID. The |routing_id| can be
-  // set to 'MSG_ROUTING_NONE' if the true ID is not yet known. In this case,
-  // CompleteInit must be called later with the true ID.
+  // Initializes this view with the given parent and ID.
   void Init(gfx::NativeViewId parent,
             int32 opener_id,
             const RendererPreferences& renderer_prefs,
             SharedRenderViewCounter* counter,
             int32 routing_id,
             const string16& frame_name);
 
   void UpdateURL(WebKit::WebFrame* frame);
   void UpdateTitle(WebKit::WebFrame* frame, const string16& title);
   void UpdateSessionHistory(WebKit::WebFrame* frame);
@@ skipping 44 matching lines @@
                             std::wstring* result);
 
   // Sends a message and runs a nested message loop.
   bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message);
 
   // Adds search provider from the given OpenSearch description URL as a
   // keyword search.
   void AddGURLSearchProvider(const GURL& osd_url,
                              const ViewHostMsg_PageHasOSDD_Type& provider_type);
 
-  // Called in a posted task by textFieldDidChange() to work-around a WebKit bug
-  // http://bugs.webkit.org/show_bug.cgi?id=16976
-  void TextFieldDidChangeImpl(const WebKit::WebInputElement& element);
-
   // Send queued accessibility notifications from the renderer to the browser.
   void SendPendingAccessibilityNotifications();
 
   // IPC message handlers ------------------------------------------------------
   //
   // The documentation for these functions should be in
   // render_messages_internal.h for the message that the function is handling.
 
   void OnAccessibilityDoDefaultAction(int acc_obj_id);
   void OnAccessibilityNotificationsAck();
   void OnAllowBindings(int enabled_bindings_flags);
   void OnAddMessageToConsole(const string16& frame_xpath,
                              const string16& message,
                              const WebKit::WebConsoleMessage::Level&);
   void OnAdvanceToNextMisspelling();
   void OnAllowScriptToClose(bool script_can_close);
   void OnAsyncFileOpened(base::PlatformFileError error_code,
                          IPC::PlatformFileForTransit file_for_transit,
                          int message_id);
-  void OnAutocompleteSuggestionsReturned(
-      int query_id,
-      const std::vector<string16>& suggestions,
-      int default_suggestions_index);
-  void OnAutoFillFormDataFilled(int query_id,
-                                const webkit_glue::FormData& form);
-  void OnAutoFillSuggestionsReturned(
-      int query_id,
-      const std::vector<string16>& values,
-      const std::vector<string16>& labels,
-      const std::vector<string16>& icons,
-      const std::vector<int>& unique_ids);
   void OnCancelDownload(int32 download_id);
   void OnClearFocusedNode();
   void OnClosePage(const ViewMsg_ClosePage_Params& params);
 #if defined(ENABLE_FLAPPER_HACKS)
   void OnConnectTcpACK(int request_id,
                        IPC::PlatformFileForTransit socket_for_transit,
                        const PP_Flash_NetAddress& local_addr,
                        const PP_Flash_NetAddress& remote_addr);
 #endif
   void OnCopy();
@@ skipping 58 matching lines @@
   void OnHandleMessageFromExternalHost(const std::string& message,
                                        const std::string& origin,
                                        const std::string& target);
   void OnInstallMissingPlugin();
   void OnLoadBlockedPlugins();
   void OnMediaPlayerActionAt(const gfx::Point& location,
                              const WebKit::WebMediaPlayerAction& action);
   void OnMoveOrResizeStarted();
   void OnNavigate(const ViewMsg_Navigate_Params& params);
   void OnNotifyRendererViewType(ViewType::Type view_type);
-  void OnFillPasswordForm(
-      const webkit_glue::PasswordFormFillData& form_data);
   void OnPaste();
 #if defined(OS_MACOSX)
   void OnPluginImeCompositionConfirmed(const string16& text, int plugin_id);
 #endif
   void OnPrintingDone(int document_cookie, bool success);
   void OnPrintPages();
   void OnPrintPreview();
   void OnRedo();
   void OnReloadFrame();
   void OnReplace(const string16& text);
@@ skipping 415 matching lines @@
   // A list of all Pepper v1 plugins that we've created that haven't been
   // destroyed yet. Pepper v2 plugins are tracked by the pepper_delegate_.
   std::set<WebPluginDelegatePepper*> current_oldstyle_pepper_plugins_;
 
   // A list of all BlockedPlugins so they can all be loaded if needed.
   std::set<BlockedPlugin*> blocked_plugins_;
 
   // Helper objects ------------------------------------------------------------
 
   ScopedRunnableMethodFactory<RenderView> page_info_method_factory_;
-  ScopedRunnableMethodFactory<RenderView> autofill_method_factory_;
   ScopedRunnableMethodFactory<RenderView> accessibility_method_factory_;
 
   // Responsible for translating the page contents to other languages.
   TranslateHelper translate_helper_;
 
-  // Responsible for automatically filling login and password textfields.
-  scoped_ptr<PasswordAutocompleteManager> password_autocomplete_manager_;
-
-  // Responsible for filling forms (AutoFill) and single text entries
-  // (Autocomplete).
-  scoped_ptr<AutoFillHelper> autofill_helper_;
-
-  // Tracks when text input controls get clicked.
-  // IMPORTANT: this should be declared after autofill_helper_ and
-  // password_autocomplete_manager_ so the tracker is deleted first (so we won't
-  // run the risk of notifying deleted objects).
-  scoped_ptr<PageClickTracker> page_click_tracker_;
-
   RendererWebCookieJarImpl cookie_jar_;
 
+  // The next group of objects all implement Observer, so are deleted along with
+  // the RenderView automatically.  This is why we just store weak references.
+
   // Provides access to this renderer from the remote Inspector UI.
-  scoped_ptr<DevToolsAgent> devtools_agent_;
+  DevToolsAgent* devtools_agent_;
 
   // DevToolsClient for renderer hosting developer tools UI. It's NULL for other
   // render views.
-  scoped_ptr<DevToolsClient> devtools_client_;
+  DevToolsClient* devtools_client_;
 
   // Holds a reference to the service which provides desktop notifications.
-  scoped_ptr<NotificationProvider> notification_provider_;
+  NotificationProvider* notification_provider_;
+
+  // The geolocation dispatcher attached to this view, lazily initialized.
+  GeolocationDispatcher* geolocation_dispatcher_;
+
+  // The speech dispatcher attached to this view, lazily initialized.
+  SpeechInputDispatcher* speech_input_dispatcher_;
+
+  // Device orientation dispatcher attached to this view; lazily initialized.
+  DeviceOrientationDispatcher* device_orientation_dispatcher_;
 
   // PrintWebViewHelper handles printing.  Note that this object is constructed
   // when printing for the first time but only destroyed with the RenderView.
   scoped_ptr<PrintWebViewHelper> print_helper_;
 
   scoped_refptr<AudioMessageFilter> audio_message_filter_;
 
-  // The geolocation dispatcher attached to this view, lazily initialized.
-  scoped_ptr<GeolocationDispatcher> geolocation_dispatcher_;
-
   // Handles accessibility requests into the renderer side, as well as
   // maintains the cache and other features of the accessibility tree.
   scoped_ptr<WebKit::WebAccessibilityCache> accessibility_;
 
   // Collect renderer accessibility notifications until they are ready to be
   // sent to the browser.
   std::vector<RendererAccessibilityNotification>
       pending_accessibility_notifications_;
 
   // Set if we are waiting for a accessibility notification ack.
   bool accessibility_ack_pending_;
 
-  // The speech dispatcher attached to this view, lazily initialized.
-  scoped_ptr<SpeechInputDispatcher> speech_input_dispatcher_;
-
-  // Device orientation dispatcher attached to this view; lazily initialized.
-  scoped_ptr<DeviceOrientationDispatcher> device_orientation_dispatcher_;
-
   // Responsible for sending page load related histograms.
   PageLoadHistograms page_load_histograms_;
 
   // Handles the interaction between the RenderView and the phishing
   // classifier.
   scoped_ptr<safe_browsing::PhishingClassifierDelegate> phishing_delegate_;
 
   // Misc ----------------------------------------------------------------------
 
   // The current and pending file chooser completion objects. If the queue is
@@ skipping 65 matching lines @@
 
   // The external popup for the currently showing select popup.
   scoped_ptr<ExternalPopupMenu> external_popup_menu_;
 
   // The custom menu event listener, if any.
   CustomMenuListener* custom_menu_listener_;
 
   // Reports load progress to the browser.
   scoped_ptr<LoadProgressTracker> load_progress_tracker_;
 
+  // All the registered observers.  We expect this list to be small, so vector
+  // is fine.
+  std::vector<Observer*> observers_;
+
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a
   // bunch of stuff, you should probably create a helper class and put your
-  // data and methods on that to avoid bloating RenderView more.
+  // data and methods on that to avoid bloating RenderView more.  You can use
+  // the Observer interface to filter IPC messages and receive frame change
+  // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_