diff options
26 files changed, 219 insertions, 101 deletions
diff --git a/webkit/glue/context_menu.cc b/webkit/glue/context_menu.cc new file mode 100644 index 0000000..390d740 --- /dev/null +++ b/webkit/glue/context_menu.cc @@ -0,0 +1,38 @@ +// Copyright (c) 2010 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. + +#include "webkit/glue/context_menu.h" + +ContextMenuParams::ContextMenuParams() { +} + +ContextMenuParams::ContextMenuParams(const WebKit::WebContextMenuData& data) + : media_type(data.mediaType), + x(data.mousePosition.x), + y(data.mousePosition.y), + link_url(data.linkURL), + unfiltered_link_url(data.linkURL), + src_url(data.srcURL), + is_image_blocked(data.isImageBlocked), + page_url(data.pageURL), + frame_url(data.frameURL), + media_flags(data.mediaFlags), + selection_text(UTF16ToWideHack(data.selectedText)), + misspelled_word(data.misspelledWord), + spellcheck_enabled(data.isSpellCheckingEnabled), + is_editable(data.isEditable), +#if defined(OS_MACOSX) + writing_direction_default(data.writingDirectionDefault), + writing_direction_left_to_right(data.writingDirectionLeftToRight), + writing_direction_right_to_left(data.writingDirectionRightToLeft), +#endif // OS_MACOSX + edit_flags(data.editFlags), + security_info(data.securityInfo), + frame_charset(data.frameEncoding.utf8()) { + for (size_t i = 0; i < data.customItems.size(); ++i) + custom_items.push_back(WebMenuItem(data.customItems[i])); +} + +ContextMenuParams::~ContextMenuParams() { +} diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h index 764fb9d..b681a38 100644 --- a/webkit/glue/context_menu.h +++ b/webkit/glue/context_menu.h @@ -96,34 +96,9 @@ struct ContextMenuParams { std::vector<WebMenuItem> custom_items; - ContextMenuParams() {} - - ContextMenuParams(const WebKit::WebContextMenuData& data) - : media_type(data.mediaType), - x(data.mousePosition.x), - y(data.mousePosition.y), - link_url(data.linkURL), - unfiltered_link_url(data.linkURL), - src_url(data.srcURL), - is_image_blocked(data.isImageBlocked), - page_url(data.pageURL), - frame_url(data.frameURL), - media_flags(data.mediaFlags), - selection_text(UTF16ToWideHack(data.selectedText)), - misspelled_word(data.misspelledWord), - spellcheck_enabled(data.isSpellCheckingEnabled), - is_editable(data.isEditable), -#if defined(OS_MACOSX) - writing_direction_default(data.writingDirectionDefault), - writing_direction_left_to_right(data.writingDirectionLeftToRight), - writing_direction_right_to_left(data.writingDirectionRightToLeft), -#endif // OS_MACOSX - edit_flags(data.editFlags), - security_info(data.securityInfo), - frame_charset(data.frameEncoding.utf8()) { - for (size_t i = 0; i < data.customItems.size(); ++i) - custom_items.push_back(WebMenuItem(data.customItems[i])); - } + ContextMenuParams(); + ContextMenuParams(const WebKit::WebContextMenuData& data); + ~ContextMenuParams(); }; #endif // WEBKIT_GLUE_CONTEXT_MENU_H_ diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index 09c3f40..d58fc4e 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -173,6 +173,10 @@ NPClass CppNPObject::np_class_ = { return obj->bound_class->SetProperty(ident, value); } +CppBoundClass::CppBoundClass() + : bound_to_frame_(false) { +} + CppBoundClass::~CppBoundClass() { for (MethodList::iterator i = methods_.begin(); i != methods_.end(); ++i) delete i->second; diff --git a/webkit/glue/cpp_bound_class.h b/webkit/glue/cpp_bound_class.h index dcd5c3e..a446386 100644 --- a/webkit/glue/cpp_bound_class.h +++ b/webkit/glue/cpp_bound_class.h @@ -51,7 +51,7 @@ class CppBoundClass { // The constructor should call BindMethod, BindProperty, and // SetFallbackMethod as needed to set up the methods, properties, and // fallback method. - CppBoundClass() : bound_to_frame_(false) { } + CppBoundClass(); virtual ~CppBoundClass(); // Return a CppVariant representing this class, for use with BindProperty(). diff --git a/webkit/glue/form_data.cc b/webkit/glue/form_data.cc new file mode 100644 index 0000000..4e1a6ea --- /dev/null +++ b/webkit/glue/form_data.cc @@ -0,0 +1,34 @@ +// Copyright (c) 2010 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. + +#include "webkit/glue/form_data.h" + +namespace webkit_glue { + +FormData::FormData() + : user_submitted(false) { +} + +FormData::FormData(const FormData& data) + : name(data.name), + method(data.method), + origin(data.origin), + action(data.action), + user_submitted(data.user_submitted), + fields(data.fields) { +} + +FormData::~FormData() { +} + +bool FormData::operator==(const FormData& form) const { + return (name == form.name && + StringToLowerASCII(method) == StringToLowerASCII(form.method) && + origin == form.origin && + action == form.action && + user_submitted == form.user_submitted && + fields == form.fields); +} + +} // namespace webkit_glue diff --git a/webkit/glue/form_data.h b/webkit/glue/form_data.h index 1556f24..f0011c7 100644 --- a/webkit/glue/form_data.h +++ b/webkit/glue/form_data.h @@ -28,17 +28,12 @@ struct FormData { // A vector of all the input fields in the form. std::vector<FormField> fields; - FormData() : user_submitted(false) {} + FormData(); + FormData(const FormData& data); + ~FormData(); // Used by FormStructureTest. - inline bool operator==(const FormData& form) const { - return (name == form.name && - StringToLowerASCII(method) == StringToLowerASCII(form.method) && - origin == form.origin && - action == form.action && - user_submitted == form.user_submitted && - fields == form.fields); - } + bool operator==(const FormData& form) const; }; } // namespace webkit_glue diff --git a/webkit/glue/form_field.cc b/webkit/glue/form_field.cc index a0fbdef..30d22ad 100644 --- a/webkit/glue/form_field.cc +++ b/webkit/glue/form_field.cc @@ -66,6 +66,9 @@ FormField::FormField(const string16& label, size_(size) { } +FormField::~FormField() { +} + bool FormField::operator==(const FormField& field) const { // A FormField stores a value, but the value is not part of the identity of // the field, so we don't want to compare the values. diff --git a/webkit/glue/form_field.h b/webkit/glue/form_field.h index 2a1ffcf..56d8969 100644 --- a/webkit/glue/form_field.h +++ b/webkit/glue/form_field.h @@ -22,6 +22,7 @@ class FormField { const string16& value, const string16& form_control_type, int size); + ~FormField(); const string16& label() const { return label_; } const string16& name() const { return name_; } diff --git a/webkit/glue/ftp_directory_listing_response_delegate.h b/webkit/glue/ftp_directory_listing_response_delegate.h index 1218da9..e259c1e 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.h +++ b/webkit/glue/ftp_directory_listing_response_delegate.h @@ -61,6 +61,8 @@ class FtpDirectoryListingResponseDelegate { // True if we got an error when parsing the response. bool had_parsing_error_; + + DISALLOW_COPY_AND_ASSIGN(FtpDirectoryListingResponseDelegate); }; } // namespace webkit_glue diff --git a/webkit/glue/password_form.cc b/webkit/glue/password_form.cc new file mode 100644 index 0000000..97777dc --- /dev/null +++ b/webkit/glue/password_form.cc @@ -0,0 +1,36 @@ +// Copyright (c) 2010 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. + +#include "webkit/glue/password_form.h" + +namespace webkit_glue { + +PasswordForm::PasswordForm() + : scheme(SCHEME_HTML), + ssl_valid(false), + preferred(false), + blacklisted_by_user(false) { +} + +PasswordForm::PasswordForm(const WebKit::WebPasswordFormData& web_password_form) + : scheme(SCHEME_HTML), + signon_realm(web_password_form.signonRealm.utf8()), + origin(web_password_form.origin), + action(web_password_form.action), + submit_element(web_password_form.submitElement), + username_element(web_password_form.userNameElement), + username_value(web_password_form.userNameValue), + password_element(web_password_form.passwordElement), + password_value(web_password_form.passwordValue), + old_password_element(web_password_form.oldPasswordElement), + old_password_value(web_password_form.oldPasswordValue), + ssl_valid(false), + preferred(false), + blacklisted_by_user(false) { +} + +PasswordForm::~PasswordForm() { +} + +} // namespace webkit_glue diff --git a/webkit/glue/password_form.h b/webkit/glue/password_form.h index 57a54c1..c2967a4 100644 --- a/webkit/glue/password_form.h +++ b/webkit/glue/password_form.h @@ -32,9 +32,9 @@ namespace webkit_glue { // about a particular "saved password entry" to our PasswordForm // representation. // -// The field descriptions in the struct specification below are -// intended to describe which fields are not strictly required when adding a saved -// password entry to the database and how they can affect the matching process. +// The field descriptions in the struct specification below are intended to +// describe which fields are not strictly required when adding a saved password +// entry to the database and how they can affect the matching process. struct PasswordForm { // Enum to differentiate between HTML form based authentication, and dialogs @@ -135,29 +135,9 @@ struct PasswordForm { // When parsing an HTML form, this is not used. bool blacklisted_by_user; - PasswordForm() - : scheme(SCHEME_HTML), - ssl_valid(false), - preferred(false), - blacklisted_by_user(false) { - } - - PasswordForm(const WebKit::WebPasswordFormData& web_password_form) - : scheme(SCHEME_HTML), - signon_realm(web_password_form.signonRealm.utf8()), - origin(web_password_form.origin), - action(web_password_form.action), - submit_element(web_password_form.submitElement), - username_element(web_password_form.userNameElement), - username_value(web_password_form.userNameValue), - password_element(web_password_form.passwordElement), - password_value(web_password_form.passwordValue), - old_password_element(web_password_form.oldPasswordElement), - old_password_value(web_password_form.oldPasswordValue), - ssl_valid(false), - preferred(false), - blacklisted_by_user(false) { - } + PasswordForm(); + PasswordForm(const WebKit::WebPasswordFormData& web_password_form); + ~PasswordForm(); }; // Map username to PasswordForm* for convenience. See password_form_manager.h. diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc index b6e0d5e..7e5c0ef 100644 --- a/webkit/glue/webaccessibility.cc +++ b/webkit/glue/webaccessibility.cc @@ -269,6 +269,9 @@ WebAccessibility::WebAccessibility(const WebKit::WebAccessibilityObject& src, Init(src, cache); } +WebAccessibility::~WebAccessibility() { +} + void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src, WebKit::WebAccessibilityCache* cache) { name = src.title(); diff --git a/webkit/glue/webaccessibility.h b/webkit/glue/webaccessibility.h index 305bc0ca..e6202ee 100644 --- a/webkit/glue/webaccessibility.h +++ b/webkit/glue/webaccessibility.h @@ -166,6 +166,8 @@ struct WebAccessibility { WebAccessibility(const WebKit::WebAccessibilityObject& src, WebKit::WebAccessibilityCache* cache); + ~WebAccessibility(); + // Initialize an already-created struct, same as the constructor a void Init(const WebKit::WebAccessibilityObject& src, WebKit::WebAccessibilityCache* cache); diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 11bc96d..8e3f87b 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -58,6 +58,9 @@ std::string WebClipboardImpl::URLToImageMarkup(const WebURL& url, return markup; } +WebClipboardImpl::~WebClipboardImpl() { +} + bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) { Clipboard::FormatType format_type; Clipboard::Buffer buffer_type; diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h index 92c4a5e..6a83a6d 100644 --- a/webkit/glue/webclipboard_impl.h +++ b/webkit/glue/webclipboard_impl.h @@ -19,7 +19,7 @@ class WebClipboardImpl : public WebKit::WebClipboard { static std::string URLToImageMarkup(const WebKit::WebURL& url, const WebKit::WebString& title); - virtual ~WebClipboardImpl() {} + virtual ~WebClipboardImpl(); // WebClipboard methods: virtual bool isFormatAvailable(Format, Buffer); diff --git a/webkit/glue/webcookie.cc b/webkit/glue/webcookie.cc new file mode 100644 index 0000000..cb255bd --- /dev/null +++ b/webkit/glue/webcookie.cc @@ -0,0 +1,43 @@ +// Copyright (c) 2010 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. + +#include "webkit/glue/webcookie.h" + +namespace webkit_glue { + +WebCookie::WebCookie() + : expires(0), + http_only(false), + secure(false), + session(false) { +} + +WebCookie::WebCookie(const net::CookieMonster::CanonicalCookie& c) + : name(c.Name()), + value(c.Value()), + domain(c.Domain()), + path(c.Path()), + expires(c.ExpiryDate().ToDoubleT() * 1000), + http_only(c.IsHttpOnly()), + secure(c.IsSecure()), + session(!c.IsPersistent()) { +} + +WebCookie::WebCookie(const std::string& name, const std::string& value, + const std::string& domain, const std::string& path, + double expires, bool http_only, bool secure, bool session) + : name(name), + value(value), + domain(domain), + path(path), + expires(expires), + http_only(http_only), + secure(secure), + session(session) { +} + +WebCookie::~WebCookie() { +} + +} // namespace webkit_glue diff --git a/webkit/glue/webcookie.h b/webkit/glue/webcookie.h index e2f11e2..11411d8 100644 --- a/webkit/glue/webcookie.h +++ b/webkit/glue/webcookie.h @@ -14,38 +14,12 @@ namespace webkit_glue { struct WebCookie { - + WebCookie(); + explicit WebCookie(const net::CookieMonster::CanonicalCookie& c); WebCookie(const std::string& name, const std::string& value, const std::string& domain, const std::string& path, double expires, - bool http_only, bool secure, bool session) - : name(name), - value(value), - domain(domain), - path(path), - expires(expires), - http_only(http_only), - secure(secure), - session(session) { - } - - explicit WebCookie(const net::CookieMonster::CanonicalCookie& c) - : name(c.Name()), - value(c.Value()), - domain(c.Domain()), - path(c.Path()), - expires(c.ExpiryDate().ToDoubleT() * 1000), - http_only(c.IsHttpOnly()), - secure(c.IsSecure()), - session(!c.IsPersistent()) { - } - - // For default constructions. - WebCookie() - : expires(0), - http_only(false), - secure(false), - session(false) { - } + bool http_only, bool secure, bool session); + ~WebCookie(); // Cookie name. std::string name; diff --git a/webkit/glue/webdropdata.cc b/webkit/glue/webdropdata.cc index d46987a..ea9e6c6 100644 --- a/webkit/glue/webdropdata.cc +++ b/webkit/glue/webdropdata.cc @@ -15,6 +15,10 @@ using WebKit::WebDragData; using WebKit::WebString; using WebKit::WebVector; +WebDropData::WebDropData(int32 drag_identity) + : identity(drag_identity) { +} + WebDropData::WebDropData(const WebDragData& drag_data) : identity(0), url(drag_data.url()), @@ -36,6 +40,13 @@ WebDropData::WebDropData(const WebDragData& drag_data) file_contents.assign(contents.data(), contents.size()); } +WebDropData::WebDropData() + : identity(0) { +} + +WebDropData::~WebDropData() { +} + WebDragData WebDropData::ToDragData() const { WebDragData result; result.initialize(); diff --git a/webkit/glue/webdropdata.h b/webkit/glue/webdropdata.h index 8149d8e..d129b06 100644 --- a/webkit/glue/webdropdata.h +++ b/webkit/glue/webdropdata.h @@ -24,13 +24,15 @@ class WebDragData; struct WebDropData { // Construct with a given drag identity. Note: identity is an int32 because // it is passed over the renderer NPAPI interface to gears. - explicit WebDropData(int32 drag_identity) : identity(drag_identity) {} + explicit WebDropData(int32 drag_identity); // Construct from a WebDragData object. explicit WebDropData(const WebKit::WebDragData&); // For default constructions, use drag |identity| 0. - WebDropData() : identity(0) {} + WebDropData(); + + ~WebDropData(); int32 identity; diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc index a7ba5b5..9764145 100644 --- a/webkit/glue/webfileutilities_impl.cc +++ b/webkit/glue/webfileutilities_impl.cc @@ -21,6 +21,9 @@ WebFileUtilitiesImpl::WebFileUtilitiesImpl() : sandbox_enabled_(true) { } +WebFileUtilitiesImpl::~WebFileUtilitiesImpl() { +} + bool WebFileUtilitiesImpl::fileExists(const WebString& path) { FilePath::StringType file_path = WebStringToFilePathString(path); return file_util::PathExists(FilePath(file_path)); diff --git a/webkit/glue/webfileutilities_impl.h b/webkit/glue/webfileutilities_impl.h index f35293b..5867396 100644 --- a/webkit/glue/webfileutilities_impl.h +++ b/webkit/glue/webfileutilities_impl.h @@ -13,7 +13,7 @@ namespace webkit_glue { class WebFileUtilitiesImpl : public WebKit::WebFileUtilities { public: WebFileUtilitiesImpl(); - virtual ~WebFileUtilitiesImpl() { } + virtual ~WebFileUtilitiesImpl(); // WebFileUtilities methods: virtual bool fileExists(const WebKit::WebString& path); diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 9f29672..3c6fcc5 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -289,6 +289,7 @@ 'plugins/webplugininfo.h', 'alt_error_page_resource_fetcher.cc', 'alt_error_page_resource_fetcher.h', + 'context_menu.cc', 'context_menu.h', 'cpp_binding_example.cc', 'cpp_binding_example.h', @@ -298,6 +299,7 @@ 'cpp_variant.h', 'dom_operations.cc', 'dom_operations.h', + 'form_data.cc', 'form_data.h', 'form_field.cc', 'form_field.h', @@ -315,6 +317,7 @@ 'multipart_response_delegate.h', 'npruntime_util.cc', 'npruntime_util.h', + 'password_form.cc', 'password_form.h', 'password_form_dom_manager.cc', 'password_form_dom_manager.h', @@ -332,6 +335,7 @@ 'webaccessibility.h', 'webclipboard_impl.cc', 'webclipboard_impl.h', + 'webcookie.cc', 'webcookie.h', 'webcursor.cc', 'webcursor.h', diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 7e4c871..70be0f3 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -167,6 +167,9 @@ WebKitClientImpl::WebKitClientImpl() shared_timer_suspended_(0) { } +WebKitClientImpl::~WebKitClientImpl() { +} + WebThemeEngine* WebKitClientImpl::themeEngine() { #if defined(OS_WIN) return &theme_engine_; diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h index bec7a79..8c0cfa3 100644 --- a/webkit/glue/webkitclient_impl.h +++ b/webkit/glue/webkitclient_impl.h @@ -19,7 +19,7 @@ namespace webkit_glue { class WebKitClientImpl : public WebKit::WebKitClient { public: WebKitClientImpl(); - virtual ~WebKitClientImpl() {} + virtual ~WebKitClientImpl(); // WebKitClient methods (partial implementation): virtual WebKit::WebThemeEngine* themeEngine(); diff --git a/webkit/glue/webpasswordautocompletelistener_impl.cc b/webkit/glue/webpasswordautocompletelistener_impl.cc index c3aaca8..fc15af0 100644 --- a/webkit/glue/webpasswordautocompletelistener_impl.cc +++ b/webkit/glue/webpasswordautocompletelistener_impl.cc @@ -83,6 +83,9 @@ WebPasswordAutocompleteListenerImpl::WebPasswordAutocompleteListenerImpl( data_(data) { } +WebPasswordAutocompleteListenerImpl::~WebPasswordAutocompleteListenerImpl() { +} + void WebPasswordAutocompleteListenerImpl::didBlurInputElement( const WebString& user_input) { // If this listener exists, its because the password manager had more than diff --git a/webkit/glue/webpasswordautocompletelistener_impl.h b/webkit/glue/webpasswordautocompletelistener_impl.h index 4fea455..8180a47 100644 --- a/webkit/glue/webpasswordautocompletelistener_impl.h +++ b/webkit/glue/webpasswordautocompletelistener_impl.h @@ -49,8 +49,7 @@ class WebPasswordAutocompleteListenerImpl : WebInputElementDelegate* username_element, WebInputElementDelegate* password_element, const PasswordFormFillData& data); - ~WebPasswordAutocompleteListenerImpl() { - } + virtual ~WebPasswordAutocompleteListenerImpl(); // WebKit::PasswordAutocompleteListener methods: virtual void didBlurInputElement(const WebString& user_input); |