diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 16:57:03 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 16:57:03 +0000 |
commit | 8e38341c65360b48c32b88c58d6ac490516c0c0c (patch) | |
tree | 381bfdd42b59c1c4fa2368dec5ed479d83ab6f16 /chrome/test/automation | |
parent | 0b97feeb41cb115158741daa975ec95d2e10cace (diff) | |
download | chromium_src-8e38341c65360b48c32b88c58d6ac490516c0c0c.zip chromium_src-8e38341c65360b48c32b88c58d6ac490516c0c0c.tar.gz chromium_src-8e38341c65360b48c32b88c58d6ac490516c0c0c.tar.bz2 |
FBTF: Even more ctor/virtual deinlining.
(Only 424k off Linux debug .a files).
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3859003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r-- | chrome/test/automation/automation_handle_tracker.cc | 2 | ||||
-rw-r--r-- | chrome/test/automation/automation_handle_tracker.h | 2 | ||||
-rw-r--r-- | chrome/test/automation/javascript_execution_controller.cc | 4 | ||||
-rw-r--r-- | chrome/test/automation/javascript_execution_controller.h | 4 | ||||
-rw-r--r-- | chrome/test/automation/tab_proxy.cc | 9 | ||||
-rw-r--r-- | chrome/test/automation/tab_proxy.h | 5 |
6 files changed, 20 insertions, 6 deletions
diff --git a/chrome/test/automation/automation_handle_tracker.cc b/chrome/test/automation/automation_handle_tracker.cc index 5a1e623..ab29c2a 100644 --- a/chrome/test/automation/automation_handle_tracker.cc +++ b/chrome/test/automation/automation_handle_tracker.cc @@ -22,6 +22,8 @@ AutomationResourceProxy::~AutomationResourceProxy() { tracker_->Remove(this); } +AutomationHandleTracker::AutomationHandleTracker() : channel_(NULL) {} + AutomationHandleTracker::~AutomationHandleTracker() { // Tell any live objects that the tracker is going away so they don't try to // call us when they are being destroyed. diff --git a/chrome/test/automation/automation_handle_tracker.h b/chrome/test/automation/automation_handle_tracker.h index 2e93b7b..bfa319a 100644 --- a/chrome/test/automation/automation_handle_tracker.h +++ b/chrome/test/automation/automation_handle_tracker.h @@ -74,7 +74,7 @@ class AutomationResourceProxy // discard the handle. class AutomationHandleTracker { public: - explicit AutomationHandleTracker() : channel_(NULL) {} + explicit AutomationHandleTracker(); ~AutomationHandleTracker(); // Adds the specified proxy object to the tracker. diff --git a/chrome/test/automation/javascript_execution_controller.cc b/chrome/test/automation/javascript_execution_controller.cc index 0c266eb..59308b3 100644 --- a/chrome/test/automation/javascript_execution_controller.cc +++ b/chrome/test/automation/javascript_execution_controller.cc @@ -14,6 +14,10 @@ using javascript_utils::JavaScriptPrintf; // JavaScriptExecutionController will complain. int JavaScriptExecutionController::timeout_ms_ = -1; +JavaScriptExecutionController::JavaScriptExecutionController() {} + +JavaScriptExecutionController::~JavaScriptExecutionController() {} + bool JavaScriptExecutionController::ExecuteJavaScript( const std::string& script) { scoped_ptr<Value> return_value; diff --git a/chrome/test/automation/javascript_execution_controller.h b/chrome/test/automation/javascript_execution_controller.h index 633ce55..afcdcaa 100644 --- a/chrome/test/automation/javascript_execution_controller.h +++ b/chrome/test/automation/javascript_execution_controller.h @@ -22,8 +22,8 @@ class JavaScriptObjectProxy; class JavaScriptExecutionController : public base::SupportsWeakPtr<JavaScriptExecutionController> { public: - JavaScriptExecutionController() {} - virtual ~JavaScriptExecutionController() {} + JavaScriptExecutionController(); + virtual ~JavaScriptExecutionController(); // Executes |script| and parse the return value. Returns whether the // execution and parsing succeeded. diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index 3888c79..d0d0426 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -15,6 +15,13 @@ #include "chrome/test/automation/automation_proxy.h" #include "googleurl/src/gurl.h" +TabProxy::TabProxy(AutomationMessageSender* sender, + AutomationHandleTracker* tracker, + int handle) + : AutomationResourceProxy(tracker, sender, handle) { +} + + bool TabProxy::GetTabTitle(std::wstring* title) const { if (!is_valid()) return false; @@ -799,6 +806,8 @@ void TabProxy::OnChannelError() { FOR_EACH_OBSERVER(TabProxyDelegate, observers_list_, OnChannelError(this)); } +TabProxy::~TabProxy() {} + bool TabProxy::ExecuteJavaScriptAndGetJSON(const std::string& script, std::string* json) { if (!is_valid()) diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index b360b84..4efbb86 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -57,8 +57,7 @@ class TabProxy : public AutomationResourceProxy, TabProxy(AutomationMessageSender* sender, AutomationHandleTracker* tracker, - int handle) - : AutomationResourceProxy(tracker, sender, handle) {} + int handle); // Gets the current url of the tab. bool GetCurrentURL(GURL* url) const WARN_UNUSED_RESULT; @@ -410,7 +409,7 @@ class TabProxy : public AutomationResourceProxy, void OnMessageReceived(const IPC::Message& message); void OnChannelError(); protected: - virtual ~TabProxy() {} + virtual ~TabProxy(); // Override JavaScriptExecutionController methods. // Executes |script| and gets the response JSON. Returns true on success. |