diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 17:21:10 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 17:21:10 +0000 |
commit | daa8c58ee49795d292312bbf217999c93693919c (patch) | |
tree | 561a327f148d74b0522871f15103e25a27b841f5 /webkit/glue/searchable_form_data.h | |
parent | 0b97342d07fd3ef047432b52809d31d10432ee85 (diff) | |
download | chromium_src-daa8c58ee49795d292312bbf217999c93693919c.zip chromium_src-daa8c58ee49795d292312bbf217999c93693919c.tar.gz chromium_src-daa8c58ee49795d292312bbf217999c93693919c.tar.bz2 |
Extract form related classes from the guts of WebFrameImpl.
Instead of having WebFrameImpl generate SearchableFormData, PasswordForm, and AutofillForm classes, allow the embedder (RenderView) to do so.
This is done to help minimize the dependencies WebFrameImpl has on other code, which will make it easier to move WebFrame and WebDataSource into the WebKit API.
Most significant change: Now, RenderView always sets a NavigationState on WebDataSource instances. We used to only do so for browser initiated navigations. This is done so that we can store things like SearchableFormData and friends on the NavigationState.
To facilitate this change, it was necessary to add a way through the WebKit API to refer to a HTMLFormElement. This CL introduces WebForm, which is like a RefPtr<HTMLFormElement>, so you can just copy a WebForm around by value and the right thing happens.
Some of the other changes are about moving more things into the webkit_glue namespace. On hindsight, I probably should have done that as a separate CL.
BUG=10041
TEST=none
R=brettw
Review URL: http://codereview.chromium.org/126083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/searchable_form_data.h')
-rw-r--r-- | webkit/glue/searchable_form_data.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/webkit/glue/searchable_form_data.h b/webkit/glue/searchable_form_data.h index 2164189..fc76c57 100644 --- a/webkit/glue/searchable_form_data.h +++ b/webkit/glue/searchable_form_data.h @@ -9,22 +9,19 @@ #include "googleurl/src/gurl.h" -namespace WebCore { -class Element; -class HTMLFormElement; +namespace WebKit { +class WebForm; } +namespace webkit_glue { + // SearchableFormData encapsulates a URL and class name of an INPUT field // that correspond to a searchable form request. class SearchableFormData { public: // If form contains elements that constitutes a valid searchable form // request, a SearchableFormData is created and returned. - static SearchableFormData* Create(WebCore::HTMLFormElement* form); - - // If the element is contained in a form that constitutes a valid searchable - // form, a SearchableFormData is created and returned. - static SearchableFormData* Create(WebCore::Element* element); + static SearchableFormData* Create(const WebKit::WebForm& form); // Returns true if the two SearchableFormData are equal, false otherwise. // Either argument may be NULL. If both elements are NULL, true is returned. @@ -53,7 +50,9 @@ class SearchableFormData { const std::wstring element_value_; const std::string encoding_; - DISALLOW_EVIL_CONSTRUCTORS(SearchableFormData); + DISALLOW_COPY_AND_ASSIGN(SearchableFormData); }; +} // namespace webkit_glue + #endif // WEBKIT_GLUE_SEARCHABLE_FORM_H__ |