summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorsiggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 13:48:24 +0000
committersiggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 13:48:24 +0000
commit04e3f3559dac2a7a5178e8f0d935d69970e2a33c (patch)
treead98622f0250323b5d7bd6adc4b51c4023b71872 /chrome_frame
parent89d5d7d0885d18d13e94acfbd00268d46e9752ab (diff)
downloadchromium_src-04e3f3559dac2a7a5178e8f0d935d69970e2a33c.zip
chromium_src-04e3f3559dac2a7a5178e8f0d935d69970e2a33c.tar.gz
chromium_src-04e3f3559dac2a7a5178e8f0d935d69970e2a33c.tar.bz2
Instrument Chrome and Chrome Frame for some perf measurements.
BUG=none TEST=none Review URL: http://codereview.chromium.org/1989005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_active_document.cc5
-rw-r--r--chrome_frame/chrome_frame_activex.cc4
-rw-r--r--chrome_frame/chrome_frame_automation.cc8
3 files changed, 17 insertions, 0 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 4a42951..7bc6fc3 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -27,6 +27,7 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "base/thread_local.h"
+#include "base/trace_event.h"
#include "grit/generated_resources.h"
#include "chrome/browser/tab_contents/tab_contents.h"
@@ -63,6 +64,8 @@ ChromeActiveDocument::ChromeActiveDocument()
is_automation_client_reused_(false),
popup_allowed_(false),
accelerator_table_(NULL) {
+ TRACE_EVENT_BEGIN("chromeframe.createactivedocument", this, "");
+
url_fetcher_.set_frame_busting(false);
memset(&navigation_info_, 0, sizeof(navigation_info_));
}
@@ -121,6 +124,8 @@ ChromeActiveDocument::~ChromeActiveDocument() {
}
// ChromeFramePlugin
BaseActiveX::Uninitialize();
+
+ TRACE_EVENT_END("chromeframe.createactivedocument", this, "");
}
// Override DoVerb
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc
index a662153..eb1283a 100644
--- a/chrome_frame/chrome_frame_activex.cc
+++ b/chrome_frame/chrome_frame_activex.cc
@@ -18,6 +18,7 @@
#include "base/scoped_bstr_win.h"
#include "base/singleton.h"
#include "base/string_util.h"
+#include "base/trace_event.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/automation/tab_proxy.h"
@@ -112,6 +113,7 @@ HHOOK InstallLocalWindowHook(HWND window) {
ChromeFrameActivex::ChromeFrameActivex()
: chrome_wndproc_hook_(NULL) {
+ TRACE_EVENT_BEGIN("chromeframe.createactivex", this, "");
}
HRESULT ChromeFrameActivex::FinalConstruct() {
@@ -139,6 +141,8 @@ ChromeFrameActivex::~ChromeFrameActivex() {
// ChromeFramePlugin::Uninitialize()
Base::Uninitialize();
+
+ TRACE_EVENT_END("chromeframe.createactivex", this, "");
}
LRESULT ChromeFrameActivex::OnCreate(UINT message, WPARAM wparam, LPARAM lparam,
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index ec3d1f6..49971d8 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
+#include "base/trace_event.h"
#include "base/file_util.h"
#include "base/file_version_info.h"
#include "base/lock.h"
@@ -130,6 +131,8 @@ class ChromeFrameAutomationProxyImpl::CFMsgDispatcher
ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl(
int launch_timeout)
: AutomationProxy(launch_timeout) {
+ TRACE_EVENT_BEGIN("chromeframe.automationproxy", this, "");
+
sync_ = new CFMsgDispatcher();
message_filter_ = new TabProxyNotificationMessageFilter(tracker_.get());
// Order of filters is not important.
@@ -138,6 +141,7 @@ ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl(
}
ChromeFrameAutomationProxyImpl::~ChromeFrameAutomationProxyImpl() {
+ TRACE_EVENT_END("chromeframe.automationproxy", this, "");
}
void ChromeFrameAutomationProxyImpl::SendAsAsync(IPC::SyncMessage* msg,
@@ -216,6 +220,8 @@ ProxyFactory::~ProxyFactory() {
void ProxyFactory::GetAutomationServer(
LaunchDelegate* delegate, const ChromeFrameLaunchParams& params,
void** automation_server_id) {
+ TRACE_EVENT_BEGIN("chromeframe.createproxy", this, "");
+
ProxyCacheEntry* entry = NULL;
// Find already existing launcher thread for given profile
AutoLock lock(lock_);
@@ -351,6 +357,8 @@ void ProxyFactory::CreateProxy(ProxyFactory::ProxyCacheEntry* entry,
AUTOMATION_CREATE_TAB_FAILED + 1);
}
+ TRACE_EVENT_END("chromeframe.createproxy", this, "");
+
// Finally set the proxy.
entry->proxy = proxy;
delegate->LaunchComplete(proxy, entry->launch_result);