diff options
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 5 | ||||
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 5 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
4 files changed, 22 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 96a4715..c1077ac 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -45,6 +45,7 @@ #include "base/stats_counters.h" #include "base/stats_table.h" #include "base/string_util.h" +#include "base/trace_event.h" #include "chrome/browser/diagnostics/diagnostics_main.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/chrome_constants.h" @@ -420,6 +421,8 @@ int ChromeMain(int argc, char** argv) { // The exit manager is in charge of calling the dtors of singleton objects. base::AtExitManager exit_manager; + TRACE_EVENT_BEGIN("chrome.main", NULL, ""); + // We need this pool for all the objects created before we get to the // event loop, but we don't want to leave them hanging around until the // app quits. Each "main" needs to flush this pool right before it goes into @@ -841,5 +844,7 @@ int ChromeMain(int argc, char** argv) { DestructCrashReporter(); #endif // OS_MACOSX && GOOGLE_CHROME_BUILD + TRACE_EVENT_END("chrome.main", NULL, ""); + return rv; } 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); |