Switch to WebFrame from the WebKit API.

I tried to avoid unnecessary changes in this CL to help make it easier to
review.

As part of this CL, glue/webtextinput* are folded into WebFrame / WebFrameImpl.

R=dglazkov
BUG=10034
TEST=none

Review URL: http://codereview.chromium.org/164225

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22896 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 101 insertions, 120 deletions

diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index bdfac0c..0749a61 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -29,8 +29,8 @@
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "skia/ext/platform_canvas.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/glue/password_autocomplete_listener.h"
-#include "webkit/glue/webframe.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ -44,8 +44,6 @@ class WebDataSourceImpl;
 class WebPluginDelegate;
 class WebView;
 class WebViewImpl;
-class WebTextInput;
-class WebTextInputImpl;
 
 namespace gfx {
 class BitmapPlatformDevice;
@@ -63,7 +61,8 @@ struct WindowFeatures;
 }
 
 // Implementation of WebFrame, note that this is a reference counted object.
-class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
+class WebFrameImpl : public WebKit::WebFrame,
+                     public base::RefCounted<WebFrameImpl> {
  public:
   WebFrameImpl();
   ~WebFrameImpl();
@@ -75,117 +74,106 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // Called by the WebViewImpl to initialize its main frame:
   void InitMainFrame(WebViewImpl* webview_impl);
 
-  // WebFrame
-  virtual void Reload();
-  virtual void LoadRequest(const WebKit::WebURLRequest& request);
-  virtual void LoadHistoryItem(const WebKit::WebHistoryItem& item);
-  virtual void LoadData(
-      const WebKit::WebData& data,
-      const WebKit::WebString& mime_type,
-      const WebKit::WebString& text_encoding,
-      const WebKit::WebURL& base_url,
-      const WebKit::WebURL& unreachable_url = WebKit::WebURL(),
-      bool replace = false);
-  virtual void LoadHTMLString(
-      const WebKit::WebData& data,
-      const WebKit::WebURL& base_url,
-      const WebKit::WebURL& unreachable_url = WebKit::WebURL(),
-      bool replace = false);
-  virtual void DispatchWillSendRequest(WebKit::WebURLRequest* request);
-  virtual void CommitDocumentData(const char* data, size_t data_len);
-  virtual void ExecuteScript(const WebKit::WebScriptSource& source);
-  virtual void ExecuteScriptInNewContext(
-      const WebKit::WebScriptSource* sources, int num_sources,
+  // WebFrame methods:
+  virtual WebKit::WebString name() const;
+  virtual WebKit::WebURL url() const;
+  virtual WebKit::WebURL favIconURL() const;
+  virtual WebKit::WebURL openSearchDescriptionURL() const;
+  virtual WebKit::WebSize scrollOffset() const;
+  virtual WebKit::WebSize contentsSize() const;
+  virtual int contentsPreferredWidth() const;
+  virtual bool hasVisibleContent() const;
+  virtual WebView* view() const;
+  virtual WebKit::WebFrame* opener() const;
+  virtual WebKit::WebFrame* parent() const;
+  virtual WebKit::WebFrame* top() const;
+  virtual WebKit::WebFrame* firstChild() const;
+  virtual WebKit::WebFrame* lastChild() const;
+  virtual WebKit::WebFrame* nextSibling() const;
+  virtual WebKit::WebFrame* previousSibling() const;
+  virtual WebKit::WebFrame* traverseNext(bool wrap) const;
+  virtual WebKit::WebFrame* traversePrevious(bool wrap) const;
+  virtual WebKit::WebFrame* findChildByName(const WebKit::WebString& name) const;
+  virtual WebKit::WebFrame* findChildByExpression(
+      const WebKit::WebString& xpath) const;
+  virtual void forms(WebKit::WebVector<WebKit::WebForm>&) const;
+  virtual WebKit::WebString securityOrigin() const;
+  virtual void grantUniversalAccess();
+  virtual NPObject* windowObject() const;
+  virtual void bindToWindowObject(
+      const WebKit::WebString& name, NPObject* object);
+  virtual void executeScript(const WebKit::WebScriptSource&);
+  virtual void executeScriptInNewContext(
+      const WebKit::WebScriptSource* sources, unsigned num_sources,
       int extension_group);
-  virtual void ExecuteScriptInNewWorld(
-      const WebKit::WebScriptSource* sources, int num_sources,
+  virtual void executeScriptInNewWorld(
+      const WebKit::WebScriptSource* sources, unsigned num_sources,
       int extension_group);
-  virtual bool InsertCSSStyles(const std::string& css);
-  virtual WebKit::WebHistoryItem GetPreviousHistoryItem() const;
-  virtual WebKit::WebHistoryItem GetCurrentHistoryItem() const;
-  virtual GURL GetURL() const;
-  virtual GURL GetFavIconURL() const;
-  virtual GURL GetOSDDURL() const;
-  virtual int GetContentsPreferredWidth() const;
-  virtual WebKit::WebDataSource* GetDataSource() const;
-  virtual WebKit::WebDataSource* GetProvisionalDataSource() const;
-  virtual void StopLoading();
-  virtual bool IsLoading() const;
-  virtual WebFrame* GetOpener() const;
-  virtual WebFrame* GetParent() const;
-  virtual WebFrame* GetTop() const;
-  virtual WebFrame* GetChildFrame(const std::wstring& xpath) const;
-  virtual WebView* GetView() const;
-  virtual void GetForms(std::vector<WebKit::WebForm>* forms) const;
-  virtual std::string GetSecurityOrigin() const;
-
-  // This method calls createRuntimeObject (in KJS::Bindings::Instance), which
-  // increments the refcount of the NPObject passed in.
-  virtual void BindToWindowObject(const std::wstring& name, NPObject* object);
-  virtual void CallJSGC();
-
-  virtual void GrantUniversalAccess();
-
-  virtual NPObject* GetWindowNPObject();
-
-#if USE(V8)
-  // Returns the V8 context for this frame, or an empty handle if there is
-  // none.
-  virtual v8::Local<v8::Context> GetMainWorldScriptContext();
+  virtual void addMessageToConsole(const WebKit::WebConsoleMessage&);
+  virtual void collectGarbage();
+#if WEBKIT_USING_V8
+  virtual v8::Local<v8::Context> mainWorldScriptContext() const;
 #endif
-
-  virtual void GetContentAsPlainText(int max_chars, std::wstring* text) const;
-  virtual bool Find(
-      int request_id,
-      const string16& search_text,
-      const WebKit::WebFindOptions& options,
-      bool wrap_within_frame,
+  virtual bool insertStyleText(const WebKit::WebString& style_text);
+  virtual void reload();
+  virtual void loadRequest(const WebKit::WebURLRequest& request);
+  virtual void loadHistoryItem(const WebKit::WebHistoryItem& history_item);
+  virtual void loadData(
+      const WebKit::WebData& data, const WebKit::WebString& mime_type,
+      const WebKit::WebString& text_encoding, const WebKit::WebURL& base_url,
+      const WebKit::WebURL& unreachable_url, bool replace);
+  virtual void loadHTMLString(
+      const WebKit::WebData& html, const WebKit::WebURL& base_url,
+      const WebKit::WebURL& unreachable_url, bool replace);
+  virtual bool isLoading() const;
+  virtual void stopLoading();
+  virtual WebKit::WebDataSource* provisionalDataSource() const;
+  virtual WebKit::WebDataSource* dataSource() const;
+  virtual WebKit::WebHistoryItem previousHistoryItem() const;
+  virtual WebKit::WebHistoryItem currentHistoryItem() const;
+  virtual void enableViewSourceMode(bool enable);
+  virtual bool isViewSourceModeEnabled() const;
+  virtual void dispatchWillSendRequest(WebKit::WebURLRequest& request);
+  virtual void commitDocumentData(const char* data, size_t length);
+  virtual unsigned unloadListenerCount() const;
+  virtual void replaceSelection(const WebKit::WebString& text);
+  virtual void insertText(const WebKit::WebString& text);
+  virtual void setMarkedText(
+      const WebKit::WebString& text, unsigned location, unsigned length);
+  virtual void unmarkText();
+  virtual bool hasMarkedText() const;
+  virtual WebKit::WebRange markedRange() const;
+  virtual bool executeCommand(const WebKit::WebString& command);
+  virtual bool executeCommand(
+      const WebKit::WebString& command, const WebKit::WebString& value);
+  virtual bool isCommandEnabled(const WebKit::WebString& command) const;
+  virtual void enableContinuousSpellChecking(bool enable);
+  virtual bool isContinuousSpellCheckingEnabled() const;
+  virtual void selectAll();
+  virtual void clearSelection();
+  virtual bool hasSelection() const;
+  virtual WebKit::WebRange selectionRange() const;
+  virtual WebKit::WebString selectionAsText() const;
+  virtual WebKit::WebString selectionAsMarkup() const;
+  virtual int printBegin(const WebKit::WebSize& page_size);
+  virtual float printPage(int page_to_print, WebKit::WebCanvas* canvas);
+  virtual void printEnd();
+  virtual bool find(
+      int identifier, const WebKit::WebString& search_text,
+      const WebKit::WebFindOptions& options, bool wrap_within_frame,
       WebKit::WebRect* selection_rect);
-  virtual void StopFinding(bool clear_selection);
-  virtual void ScopeStringMatches(
-      int request_id,
-      const string16& search_text,
-      const WebKit::WebFindOptions& options,
-      bool reset);
-  virtual void CancelPendingScopingEffort();
-  virtual void ResetMatchCount();
-  virtual bool Visible();
-  virtual void SelectAll();
-  virtual void Copy();
-  virtual void Cut();
-  virtual void Paste();
-  virtual void Replace(const std::wstring& text);
-  virtual void ToggleSpellCheck();
-  virtual bool SpellCheckEnabled();
-  virtual void Delete();
-  virtual void Undo();
-  virtual void Redo();
-  virtual void ClearSelection();
-  virtual bool HasSelection();
-  virtual std::string GetSelection(bool as_html);
-  virtual std::string GetFullPageHtml();
-
-  virtual void SetInViewSourceMode(bool enable);
-
-  virtual bool GetInViewSourceMode() const;
-
-  virtual void DidFail(const WebCore::ResourceError&, bool was_provisional);
-
-  virtual std::wstring GetName();
-
-  virtual WebTextInput* GetTextInput();
-
-  virtual bool ExecuteEditCommandByName(const std::string& name,
-                                        const std::string& value);
-  virtual bool IsEditCommandEnabled(const std::string& name);
-
-  virtual void AddMessageToConsole(const WebKit::WebConsoleMessage&);
-
-  virtual WebKit::WebSize ScrollOffset() const;
-
-  virtual int PrintBegin(const WebKit::WebSize& page_size);
-  virtual float PrintPage(int page, WebKit::WebCanvas* canvas);
-  virtual void PrintEnd();
+  virtual void stopFinding(bool clear_selection);
+  virtual void scopeStringMatches(
+      int identifier, const WebKit::WebString& search_text,
+      const WebKit::WebFindOptions& options, bool reset);
+  virtual void cancelPendingScopingEffort();
+  virtual void increaseMatchCount(int count, int identifier);
+  virtual void reportFindInPageSelection(
+      const WebKit::WebRect& selection_rect, int active_match_ordinal,
+      int identifier);
+  virtual void resetMatchCount();
+  virtual WebKit::WebString contentAsText(size_t max_chars) const;
+  virtual WebKit::WebString contentAsMarkup() const;
 
   PassRefPtr<WebCore::Frame> CreateChildFrame(
       const WebCore::FrameLoadRequest&,
@@ -239,6 +227,8 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // allows us to navigate by pressing Enter after closing the Find box.
   void SetFindEndstateFocusAndSelection();
 
+  void DidFail(const WebCore::ResourceError& error, bool was_provisional);
+
   // Sets whether the WebFrameImpl allows its document to be scrolled.
   // If the parameter is true, allow the document to be scrolled.
   // Otherwise, disallow scrolling.
@@ -266,12 +256,6 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // WebFrameLoaderClient
   void Closing();
 
-  // See WebFrame.h for details.
-  virtual void IncreaseMatchCount(int count, int request_id);
-  virtual void ReportFindInPageSelection(const WebKit::WebRect& selection_rect,
-                                         int active_match_ordinal,
-                                         int request_id);
-
   // Used to check for leaks of this object.
   static int live_object_count_;
 
@@ -289,9 +273,6 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // a pointer back to the appropriate plugin.
   WebPluginDelegate* plugin_delegate_;
 
-  // Handling requests from TextInputController on this frame.
-  scoped_ptr<WebTextInputImpl> webtextinput_impl_;
-
   // A way for the main frame to keep track of which frame has an active
   // match. Should be NULL for all other frames.
   WebFrameImpl* active_match_frame_;