Simplifying renderer focus management

webkit/glue/webview_impl.h

 // Copyright (c) 2009 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 WEBKIT_GLUE_WEBVIEW_IMPL_H_
 #define WEBKIT_GLUE_WEBVIEW_IMPL_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 55 matching lines @@
   virtual WebFrame* GetPreviousFrameBefore(WebFrame* frame, bool wrap);
   virtual WebFrame* GetNextFrameAfter(WebFrame* frame, bool wrap);
   virtual void Resize(const WebKit::WebSize& new_size);
   virtual WebKit::WebSize GetSize() { return size(); }
   virtual void Layout();
   virtual void Paint(skia::PlatformCanvas* canvas, const WebKit::WebRect& rect);
   virtual bool HandleInputEvent(const WebKit::WebInputEvent* input_event);
   virtual void MouseCaptureLost();
   virtual void SetFocus(bool enable);
   virtual void ClearFocusedNode();
-  virtual void StoreFocusForFrame(WebFrame* frame);
   virtual bool ImeSetComposition(int string_type,
                                  int cursor_position,
                                  int target_start,
                                  int target_end,
                                  const std::wstring& ime_string);
   virtual bool ImeUpdateStatus(bool* enable_ime,
                                WebKit::WebRect* caret_rect);
   virtual void SetTextDirection(WebTextDirection direction);
   virtual void StopLoading();
   virtual void SetBackForwardListSize(int size);
-  virtual void RestoreFocus();
   virtual void SetInitialFocus(bool reverse);
   virtual bool DownloadImage(int id, const GURL& image_url, int image_size);
   virtual void SetPreferences(const WebPreferences& preferences);
   virtual const WebPreferences& GetPreferences();
   virtual void SetPageEncoding(const std::wstring& encoding_name);
   virtual std::wstring GetMainFrameEncodingName();
   virtual void ZoomIn(bool text_only);
   virtual void ZoomOut(bool text_only);
   virtual void ResetZoom();
   virtual void CopyImageAt(int x, int y);
@@ skipping 83 matching lines @@
 
   // Handles context menu events orignated via the the keyboard. These
   // include the VK_APPS virtual key and the Shift+F10 combine.
   // Code is based on the Webkit function
   // bool WebView::handleContextMenuEvent(WPARAM wParam, LPARAM lParam) in
   // webkit\webkit\win\WebView.cpp. The only significant change in this
   // function is the code to convert from a Keyboard event to the Right
   // Mouse button down event.
   bool SendContextMenuEvent(const WebKit::WebKeyboardEvent& event);
 
-  // Releases references used to restore focus.
-  void ReleaseFocusReferences();
-
   // Notifies the WebView that a load has been committed.
   // is_new_navigation will be true if a new session history item should be
   // created for that load.
   void DidCommitLoad(bool* is_new_navigation);
 
   bool context_menu_allowed() const {
     return context_menu_allowed_;
   }
 
   // Set the disposition for how this webview is to be initially shown.
@@ skipping 27 matching lines @@
   ~WebViewImpl();
 
   void ModifySelection(uint32 message,
                        WebCore::Frame* frame,
                        const WebCore::PlatformKeyboardEvent& e);
 
   scoped_refptr<WebViewDelegate> delegate_;
   WebKit::WebSize size_;
 
   WebKit::WebPoint last_mouse_position_;
-  // Reference to the Frame that last had focus. This is set once when
-  // we lose focus, and used when focus is gained to reinstall focus to
-  // the correct element.
-  RefPtr<WebCore::Frame> last_focused_frame_;
-  // Reference to the node that last had focus.
-  RefPtr<WebCore::Node> last_focused_node_;
   scoped_ptr<WebCore::Page> page_;
 
   webkit_glue::BackForwardListClientImpl back_forward_list_client_impl_;
 
   // This flag is set when a new navigation is detected.  It is used to satisfy
   // the corresponding argument to WebViewDelegate::DidCommitLoadForFrame.
   bool observed_new_navigation_;
 #ifndef NDEBUG
   // Used to assert that the new navigation we observed is the same navigation
   // when we make use of observed_new_navigation_.
@@ skipping 106 matching lines @@
   static const WebKit::WebInputEvent* current_input_event() {
     return g_current_input_event;
   }
 private:
   static const WebKit::WebInputEvent* g_current_input_event;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_IMPL_H_