diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:11:19 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:11:19 +0000 |
commit | 9b2331d912b0a15c3eef290eaa617c54a87dc68e (patch) | |
tree | 6ca5f0248ce754b74b39112c17c2d9726c004e79 /chrome/common | |
parent | 9f1e5d235d5bdb3a0fe626fe47f5468cddaf75e4 (diff) | |
download | chromium_src-9b2331d912b0a15c3eef290eaa617c54a87dc68e.zip chromium_src-9b2331d912b0a15c3eef290eaa617c54a87dc68e.tar.gz chromium_src-9b2331d912b0a15c3eef290eaa617c54a87dc68e.tar.bz2 |
Reapply r61237: FBTF: Another big ctor/dtor cleanup found by automated tools.
Removes changes to code in webkit/ that broke chrome_frame. Will debug that portion later.
(Shaves ~2MB off Linux Debug .a files)
BUG=none
TEST=compiles
First Review URL: http://codereview.chromium.org/3563004
Review URL: http://codereview.chromium.org/3621003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/extensions/extension.cc | 5 | ||||
-rw-r--r-- | chrome/common/extensions/extension.h | 1 | ||||
-rw-r--r-- | chrome/common/extensions/extension_icon_set.cc | 4 | ||||
-rw-r--r-- | chrome/common/extensions/extension_icon_set.h | 3 | ||||
-rw-r--r-- | chrome/common/extensions/url_pattern.h | 5 | ||||
-rw-r--r-- | chrome/common/indexed_db_key.cc | 3 | ||||
-rw-r--r-- | chrome/common/indexed_db_key.h | 1 | ||||
-rw-r--r-- | chrome/common/render_messages_params.cc | 35 | ||||
-rw-r--r-- | chrome/common/render_messages_params.h | 9 | ||||
-rw-r--r-- | chrome/common/renderer_preferences.cc | 23 | ||||
-rw-r--r-- | chrome/common/renderer_preferences.h | 20 | ||||
-rw-r--r-- | chrome/common/resource_response.cc | 19 | ||||
-rw-r--r-- | chrome/common/resource_response.h | 9 | ||||
-rw-r--r-- | chrome/common/webmessageportchannel_impl.h | 2 |
14 files changed, 113 insertions, 26 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index c7f6f3f..cc6b8585 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -2163,8 +2163,7 @@ ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest, static_cast<DictionaryValue*>(manifest->DeepCopy())); } -ExtensionInfo::~ExtensionInfo() { -} +ExtensionInfo::~ExtensionInfo() {} UninstalledExtensionInfo::UninstalledExtensionInfo( const Extension& extension) @@ -2174,3 +2173,5 @@ UninstalledExtensionInfo::UninstalledExtensionInfo( is_app(extension.is_app()), converted_from_user_script(extension.converted_from_user_script()), update_url(extension.update_url()) {} + +UninstalledExtensionInfo::~UninstalledExtensionInfo() {} diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 630f1af..e012ad6 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -697,6 +697,7 @@ struct ExtensionInfo { // notification. struct UninstalledExtensionInfo { explicit UninstalledExtensionInfo(const Extension& extension); + ~UninstalledExtensionInfo(); std::string extension_id; std::set<std::string> extension_api_permissions; diff --git a/chrome/common/extensions/extension_icon_set.cc b/chrome/common/extensions/extension_icon_set.cc index 3eedce0..1f1dd21 100644 --- a/chrome/common/extensions/extension_icon_set.cc +++ b/chrome/common/extensions/extension_icon_set.cc @@ -6,6 +6,10 @@ #include "base/logging.h" +ExtensionIconSet::ExtensionIconSet() {} + +ExtensionIconSet::~ExtensionIconSet() {} + void ExtensionIconSet::Clear() { map_.clear(); } diff --git a/chrome/common/extensions/extension_icon_set.h b/chrome/common/extensions/extension_icon_set.h index d1dc9f3..7fe80c5 100644 --- a/chrome/common/extensions/extension_icon_set.h +++ b/chrome/common/extensions/extension_icon_set.h @@ -12,6 +12,9 @@ // Represents the set of icons for an extension. class ExtensionIconSet { public: + ExtensionIconSet(); + ~ExtensionIconSet(); + // Access to the underlying map from icon size->path. typedef std::map<int, std::string> IconMap; const IconMap& map() const { return map_; } diff --git a/chrome/common/extensions/url_pattern.h b/chrome/common/extensions/url_pattern.h index 0067678..832673c 100644 --- a/chrome/common/extensions/url_pattern.h +++ b/chrome/common/extensions/url_pattern.h @@ -184,9 +184,8 @@ class URLPattern { }; // Used for origin comparisons in a std::set. - class EffectiveHostCompareFunctor : - public std::binary_function<URLPattern, URLPattern, bool> { - public: + class EffectiveHostCompareFunctor { + public: bool operator()(const URLPattern& a, const URLPattern& b) const { return EffectiveHostCompare(a, b); }; diff --git a/chrome/common/indexed_db_key.cc b/chrome/common/indexed_db_key.cc index 315e5b2..9f7d153 100644 --- a/chrome/common/indexed_db_key.cc +++ b/chrome/common/indexed_db_key.cc @@ -18,6 +18,9 @@ IndexedDBKey::IndexedDBKey(const WebIDBKey& key) { Set(key); } +IndexedDBKey::~IndexedDBKey() { +} + void IndexedDBKey::SetNull() { type_ = WebIDBKey::NullType; } diff --git a/chrome/common/indexed_db_key.h b/chrome/common/indexed_db_key.h index 41fb10b..29c1792 100644 --- a/chrome/common/indexed_db_key.h +++ b/chrome/common/indexed_db_key.h @@ -14,6 +14,7 @@ class IndexedDBKey { public: IndexedDBKey(); // Defaults to WebKit::WebIDBKey::InvalidType. explicit IndexedDBKey(const WebKit::WebIDBKey& key); + ~IndexedDBKey(); void SetNull(); void SetInvalid(); diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc index ac81931..1414b8a 100644 --- a/chrome/common/render_messages_params.cc +++ b/chrome/common/render_messages_params.cc @@ -188,6 +188,41 @@ ViewHostMsg_IDBDatabaseCreateObjectStore_Params:: ~ViewHostMsg_IDBDatabaseCreateObjectStore_Params() { } +ViewHostMsg_IDBIndexOpenCursor_Params::ViewHostMsg_IDBIndexOpenCursor_Params() + : response_id_(0), + key_flags_(0), + direction_(0), + idb_index_id_(0), + transaction_id_(0) { +} + +ViewHostMsg_IDBIndexOpenCursor_Params:: + ~ViewHostMsg_IDBIndexOpenCursor_Params() { +} + + +ViewHostMsg_IDBObjectStorePut_Params::ViewHostMsg_IDBObjectStorePut_Params() + : idb_object_store_id_(0), + response_id_(0), + add_only_(false), + transaction_id_(0) { +} + +ViewHostMsg_IDBObjectStorePut_Params::~ViewHostMsg_IDBObjectStorePut_Params() { +} + +ViewHostMsg_IDBObjectStoreCreateIndex_Params:: +ViewHostMsg_IDBObjectStoreCreateIndex_Params() + : response_id_(0), + unique_(false), + idb_object_store_id_(0) { +} + +ViewHostMsg_IDBObjectStoreCreateIndex_Params:: +~ViewHostMsg_IDBObjectStoreCreateIndex_Params() { +} + + ViewHostMsg_IDBObjectStoreOpenCursor_Params:: ViewHostMsg_IDBObjectStoreOpenCursor_Params() : response_id_(0), diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h index 0359b1e..1c49b66 100644 --- a/chrome/common/render_messages_params.h +++ b/chrome/common/render_messages_params.h @@ -654,6 +654,9 @@ struct ViewHostMsg_IDBDatabaseCreateObjectStore_Params { // Used to open both cursors and object cursors in IndexedDB. struct ViewHostMsg_IDBIndexOpenCursor_Params { + ViewHostMsg_IDBIndexOpenCursor_Params(); + ~ViewHostMsg_IDBIndexOpenCursor_Params(); + // The response should have this id. int32 response_id_; @@ -678,6 +681,9 @@ struct ViewHostMsg_IDBIndexOpenCursor_Params { // Used to set a value in an object store. struct ViewHostMsg_IDBObjectStorePut_Params { + ViewHostMsg_IDBObjectStorePut_Params(); + ~ViewHostMsg_IDBObjectStorePut_Params(); + // The object store's id. int32 idb_object_store_id_; @@ -699,6 +705,9 @@ struct ViewHostMsg_IDBObjectStorePut_Params { // Used to create an index. struct ViewHostMsg_IDBObjectStoreCreateIndex_Params { + ViewHostMsg_IDBObjectStoreCreateIndex_Params(); + ~ViewHostMsg_IDBObjectStoreCreateIndex_Params(); + // The response should have this id. int32 response_id_; diff --git a/chrome/common/renderer_preferences.cc b/chrome/common/renderer_preferences.cc new file mode 100644 index 0000000..4c29dd8 --- /dev/null +++ b/chrome/common/renderer_preferences.cc @@ -0,0 +1,23 @@ +// 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 "chrome/common/renderer_preferences.h" + +RendererPreferences::RendererPreferences() + : can_accept_load_drops(true), + should_antialias_text(true), + hinting(RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT), + subpixel_rendering( + RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT), + focus_ring_color(0), + thumb_active_color(0), + thumb_inactive_color(0), + track_color(0), + active_selection_bg_color(0), + active_selection_fg_color(0), + inactive_selection_bg_color(0), + inactive_selection_fg_color(0), + browser_handles_top_level_requests(false), + caret_blink_interval(0) { +} diff --git a/chrome/common/renderer_preferences.h b/chrome/common/renderer_preferences.h index dd57866..0bb72ef 100644 --- a/chrome/common/renderer_preferences.h +++ b/chrome/common/renderer_preferences.h @@ -33,6 +33,8 @@ enum RendererPreferencesSubpixelRenderingEnum { }; struct RendererPreferences { + RendererPreferences(); + // Whether the renderer's current browser context accept drops from the OS // that result in navigations away from the current page. bool can_accept_load_drops; @@ -71,24 +73,6 @@ struct RendererPreferences { // Currently only changed from default on Linux. Uses |gtk-cursor-blink| // from GtkSettings. double caret_blink_interval; - - RendererPreferences() - : can_accept_load_drops(true), - should_antialias_text(true), - hinting(RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT), - subpixel_rendering( - RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT), - focus_ring_color(0), - thumb_active_color(0), - thumb_inactive_color(0), - track_color(0), - active_selection_bg_color(0), - active_selection_fg_color(0), - inactive_selection_bg_color(0), - inactive_selection_fg_color(0), - browser_handles_top_level_requests(false), - caret_blink_interval(0) { - } }; #endif // CHROME_COMMON_RENDERER_PREFERENCES_H_ diff --git a/chrome/common/resource_response.cc b/chrome/common/resource_response.cc new file mode 100644 index 0000000..ad8f184 --- /dev/null +++ b/chrome/common/resource_response.cc @@ -0,0 +1,19 @@ +// 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 "chrome/common/resource_response.h" + +ResourceResponseHead::ResourceResponseHead() + : replace_extension_localization_templates(false) { +} + +ResourceResponseHead::~ResourceResponseHead() {} + +SyncLoadResult::SyncLoadResult() {} + +SyncLoadResult::~SyncLoadResult() {} + +ResourceResponse::ResourceResponse() {} + +ResourceResponse::~ResourceResponse() {} diff --git a/chrome/common/resource_response.h b/chrome/common/resource_response.h index 368e410d..0700a8c 100644 --- a/chrome/common/resource_response.h +++ b/chrome/common/resource_response.h @@ -18,7 +18,8 @@ // Parameters for a resource response header. struct ResourceResponseHead : webkit_glue::ResourceLoaderBridge::ResponseInfo { - ResourceResponseHead() : replace_extension_localization_templates(false) {} + ResourceResponseHead(); + ~ResourceResponseHead(); // The response status. URLRequestStatus status; @@ -31,6 +32,9 @@ struct ResourceResponseHead // Parameters for a synchronous resource response. struct SyncLoadResult : ResourceResponseHead { + SyncLoadResult(); + ~SyncLoadResult(); + // The final URL after any redirects. GURL final_url; @@ -42,10 +46,11 @@ struct SyncLoadResult : ResourceResponseHead { struct ResourceResponse : public base::RefCounted<ResourceResponse> { ResourceResponseHead response_head; + ResourceResponse(); private: friend class base::RefCounted<ResourceResponse>; - ~ResourceResponse() {} + virtual ~ResourceResponse(); }; #endif // CHROME_COMMON_RESOURCE_RESPONSE_H_ diff --git a/chrome/common/webmessageportchannel_impl.h b/chrome/common/webmessageportchannel_impl.h index 24e7ddc..313fd23 100644 --- a/chrome/common/webmessageportchannel_impl.h +++ b/chrome/common/webmessageportchannel_impl.h @@ -32,7 +32,7 @@ class WebMessagePortChannelImpl private: friend class base::RefCountedThreadSafe<WebMessagePortChannelImpl>; - ~WebMessagePortChannelImpl(); + virtual ~WebMessagePortChannelImpl(); // WebMessagePortChannel implementation. virtual void setClient(WebKit::WebMessagePortChannelClient* client); |