diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 22:05:28 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 22:05:28 +0000 |
commit | d0af7203fccbb273cd4ee112b12ca93c18441efa (patch) | |
tree | 6410ef23531cf87aac1981a74326ced5a25fa0df /webkit/glue | |
parent | 7f71e75e4eb1decfdc52f28b2ec48671d09f373b (diff) | |
download | chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.zip chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.tar.gz chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.tar.bz2 |
Revert "FBTF: Another big ctor/dtor cleanup found by automated tools."
This reverts commit 27ea47d65cf8767f350113d5ad9e25170efde811 (r61237).
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3609005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/dom_operations.cc | 4 | ||||
-rw-r--r-- | webkit/glue/dom_operations.h | 12 | ||||
-rw-r--r-- | webkit/glue/webpreferences.cc | 49 | ||||
-rw-r--r-- | webkit/glue/webpreferences.h | 47 |
4 files changed, 49 insertions, 63 deletions
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc index 6f0fd5b..22e0e75 100644 --- a/webkit/glue/dom_operations.cc +++ b/webkit/glue/dom_operations.cc @@ -425,10 +425,6 @@ static gfx::Size ParseIconSize(const string16& text) { ParseSingleIconSize(sizes[1])); } -WebApplicationInfo::WebApplicationInfo() {} - -WebApplicationInfo::~WebApplicationInfo() {} - bool ParseIconSizes(const string16& text, std::vector<gfx::Size>* sizes, bool* is_any) { diff --git a/webkit/glue/dom_operations.h b/webkit/glue/dom_operations.h index 1b6151b..20084f7 100644 --- a/webkit/glue/dom_operations.h +++ b/webkit/glue/dom_operations.h @@ -64,9 +64,6 @@ bool GetAllSavableResourceLinksForCurrentPage(WebKit::WebView* view, // Structure used when installing a web page as an app. Populated via // GetApplicationInfo. struct WebApplicationInfo { - WebApplicationInfo(); - ~WebApplicationInfo(); - struct IconInfo { GURL url; int width; @@ -137,11 +134,10 @@ WebKit::WebString GetSubResourceLinkFromElement( // Puts the meta-elements of |document| that have the attribute |attribute_name| // with a value of |attribute_value| in |meta_elements|. -void GetMetaElementsWithAttribute( - WebKit::WebDocument* document, - const string16& attribute_name, - const string16& atribute_value, - std::vector<WebKit::WebElement>* meta_elements); +void GetMetaElementsWithAttribute(WebKit::WebDocument* document, + const string16& attribute_name, + const string16& atribute_value, + std::vector<WebKit::WebElement>* meta_elements); } // namespace webkit_glue diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 3c0ee5d..ddf4ddb 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -20,55 +20,6 @@ using WebKit::WebString; using WebKit::WebURL; using WebKit::WebView; -WebPreferences::WebPreferences() - : standard_font_family(L"Times New Roman"), - fixed_font_family(L"Courier New"), - serif_font_family(L"Times New Roman"), - sans_serif_font_family(L"Arial"), - cursive_font_family(L"Script"), - fantasy_font_family(), // Not sure what to use on Windows. - default_font_size(16), - default_fixed_font_size(13), - minimum_font_size(1), - minimum_logical_font_size(6), - default_encoding("ISO-8859-1"), - javascript_enabled(true), - web_security_enabled(true), - javascript_can_open_windows_automatically(true), - loads_images_automatically(true), - plugins_enabled(true), - dom_paste_enabled(false), // enables execCommand("paste") - developer_extras_enabled(false), // Requires extra work by embedder - site_specific_quirks_enabled(false), - shrinks_standalone_images_to_fit(true), - uses_universal_detector(false), // Disabled: page cycler regression - text_areas_are_resizable(true), - java_enabled(true), - allow_scripts_to_close_windows(false), - uses_page_cache(false), - remote_fonts_enabled(true), - javascript_can_access_clipboard(false), - xss_auditor_enabled(false), - local_storage_enabled(false), - databases_enabled(false), - application_cache_enabled(false), - tabs_to_links(true), - caret_browsing_enabled(false), - hyperlink_auditing_enabled(false), - user_style_sheet_enabled(false), - author_and_user_styles_enabled(true), - allow_universal_access_from_file_urls(false), - allow_file_access_from_file_urls(false), - experimental_webgl_enabled(false), - show_composited_layer_borders(false), - accelerated_compositing_enabled(false), - accelerated_2d_canvas_enabled(false), - memory_info_enabled(false) { -} - -WebPreferences::~WebPreferences() { -} - void WebPreferences::Apply(WebView* web_view) const { WebSettings* settings = web_view->settings(); settings->setStandardFontFamily(WideToUTF16Hack(standard_font_family)); diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index e9f0c01..bc6d477 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -72,8 +72,51 @@ struct WebPreferences { // We try to keep the default values the same as the default values in // chrome, except for the cases where it would require lots of extra work for // the embedder to use the same default value. - WebPreferences(); - ~WebPreferences(); + WebPreferences() + : standard_font_family(L"Times New Roman"), + fixed_font_family(L"Courier New"), + serif_font_family(L"Times New Roman"), + sans_serif_font_family(L"Arial"), + cursive_font_family(L"Script"), + fantasy_font_family(), // Not sure what to use on Windows. + default_font_size(16), + default_fixed_font_size(13), + minimum_font_size(1), + minimum_logical_font_size(6), + default_encoding("ISO-8859-1"), + javascript_enabled(true), + web_security_enabled(true), + javascript_can_open_windows_automatically(true), + loads_images_automatically(true), + plugins_enabled(true), + dom_paste_enabled(false), // enables execCommand("paste") + developer_extras_enabled(false), // Requires extra work by embedder + site_specific_quirks_enabled(false), + shrinks_standalone_images_to_fit(true), + uses_universal_detector(false), // Disabled: page cycler regression + text_areas_are_resizable(true), + java_enabled(true), + allow_scripts_to_close_windows(false), + uses_page_cache(false), + remote_fonts_enabled(true), + javascript_can_access_clipboard(false), + xss_auditor_enabled(false), + local_storage_enabled(false), + databases_enabled(false), + application_cache_enabled(false), + tabs_to_links(true), + caret_browsing_enabled(false), + hyperlink_auditing_enabled(false), + user_style_sheet_enabled(false), + author_and_user_styles_enabled(true), + allow_universal_access_from_file_urls(false), + allow_file_access_from_file_urls(false), + experimental_webgl_enabled(false), + show_composited_layer_borders(false), + accelerated_compositing_enabled(false), + accelerated_2d_canvas_enabled(false), + memory_info_enabled(false) { + } void Apply(WebKit::WebView* web_view) const; }; |