Use WebWidget from the WebKit API. This change also makes...

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 "Page.h"
@@ skipping 31 matching lines @@
 
 class AutocompletePopupMenuClient;
 class SearchableFormData;
 class WebHistoryItemImpl;
 class WebDevToolsAgent;
 class WebDevToolsAgentImpl;
 class WebViewDelegate;
 
 class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
  public:
-  // WebView
+  // WebWidget methods:
+  virtual void close();
+  virtual WebKit::WebSize size() { return size_; }
+  virtual void resize(const WebKit::WebSize& new_size);
+  virtual void layout();
+  virtual void paint(WebKit::WebCanvas* canvas,
+                     const WebKit::WebRect& rect);
+  virtual bool handleInputEvent(const WebKit::WebInputEvent& input_event);
+  virtual void mouseCaptureLost();
+  virtual void setFocus(bool enable);
+  virtual bool handleCompositionEvent(WebKit::WebCompositionCommand command,
+                                      int cursor_position,
+                                      int target_start,
+                                      int target_end,
+                                      const WebKit::WebString& text);
+  virtual bool queryCompositionStatus(bool* enabled,
+                                      WebKit::WebRect* caret_rect);
+  virtual void setTextDirection(WebKit::WebTextDirection direction);
+
+  // WebView methods:
   virtual bool ShouldClose();
-  virtual void Close();
   virtual WebViewDelegate* GetDelegate();
   virtual void SetDelegate(WebViewDelegate*);
   virtual void SetUseEditorDelegate(bool value);
   virtual void SetTabKeyCyclesThroughElements(bool value);
   virtual WebFrame* GetMainFrame();
   virtual WebFrame* GetFocusedFrame();
   virtual void SetFocusedFrame(WebFrame* frame);
   virtual WebFrame* GetFrameWithName(const std::wstring& name);
   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 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 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);
@@ skipping 32 matching lines @@
   virtual void SetIgnoreInputEvents(bool new_value);
 
   virtual WebDevToolsAgent* GetWebDevToolsAgent();
   WebDevToolsAgentImpl* GetWebDevToolsAgentImpl();
 
   virtual void SetIsTransparent(bool is_transparent);
   virtual bool GetIsTransparent() const;
 
   // WebViewImpl
 
-  const WebKit::WebSize& size() const { return size_; }
-
   const WebKit::WebPoint& last_mouse_down_point() const {
       return last_mouse_down_point_;
   }
 
   WebCore::Frame* GetFocusedWebCoreFrame();
 
   // Returns the currently focused Node or NULL if no node has focus.
   WebCore::Node* GetFocusedNode();
 
   static WebViewImpl* FromPage(WebCore::Page* page);
@@ skipping 44 matching lines @@
   // 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.
-  void set_window_open_disposition(WindowOpenDisposition disp) {
-    window_open_disposition_ = disp;
+  void set_initial_navigation_policy(WebKit::WebNavigationPolicy policy) {
+    initial_navigation_policy_ = policy;
   }
-  WindowOpenDisposition window_open_disposition() const {
-    return window_open_disposition_;
+  WebKit::WebNavigationPolicy initial_navigation_policy() const {
+    return initial_navigation_policy_;
   }
 
   // Start a system drag and drop operation.
   void StartDragging(const WebKit::WebDragData& drag_data);
 
   // Hides the autocomplete popup if it is showing.
   void HideAutoCompletePopup();
 
   // Converts |x|, |y| from window coordinates to contents coordinates and gets
   // the underlying Node for them.
@@ skipping 82 matching lines @@
   bool doing_drag_and_drop_;
 
   bool ignore_input_events_;
 
   // Webkit expects keyPress events to be suppressed if the associated keyDown
   // event was handled. Safari implements this behavior by peeking out the
   // associated WM_CHAR event if the keydown was handled. We emulate
   // this behavior by setting this flag if the keyDown was handled.
   bool suppress_next_keypress_event_;
 
-  // The disposition for how this webview is to be initially shown.
-  WindowOpenDisposition window_open_disposition_;
+  // The policy for how this webview is to be initially shown.
+  WebKit::WebNavigationPolicy initial_navigation_policy_;
 
   // Represents whether or not this object should process incoming IME events.
   bool ime_accept_events_;
 
   // True while dispatching system drag and drop events to drag/drop targets
   // within this WebView.
   bool drag_target_dispatch_;
 
   // Valid when drag_target_dispatch_ is true; the identity of the drag data
   // copied from the WebDropData object sent from the browser process.
@@ skipping 33 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_