diff options
-rw-r--r-- | base/message_loop/message_pump_win.cc | 5 | ||||
-rw-r--r-- | base/power_monitor/power_monitor_device_source_win.cc | 6 | ||||
-rw-r--r-- | base/win/message_window.cc | 5 | ||||
-rw-r--r-- | chrome/browser/ui/views/status_icons/status_tray_win.cc | 5 | ||||
-rw-r--r-- | components/browser_watcher/endsession_watcher_window_win.cc | 6 | ||||
-rw-r--r-- | components/storage_monitor/storage_monitor_win.cc | 6 | ||||
-rw-r--r-- | content/browser/renderer_host/render_widget_host_view_base.cc | 5 | ||||
-rw-r--r-- | content/browser/system_message_window_win.h | 6 | ||||
-rw-r--r-- | ui/gfx/win/window_impl.cc | 4 | ||||
-rw-r--r-- | ui/views/controls/menu/native_menu_win.cc | 5 | ||||
-rw-r--r-- | win8/metro_driver/metro_driver_win7.cc | 5 |
11 files changed, 58 insertions, 0 deletions
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc index c140691..a7a1485 100644 --- a/base/message_loop/message_pump_win.cc +++ b/base/message_loop/message_pump_win.cc @@ -162,6 +162,11 @@ void MessagePumpForUI::ScheduleDelayedWork(const TimeTicks& delayed_work_time) { // static LRESULT CALLBACK MessagePumpForUI::WndProcThunk( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "440919 MessagePumpForUI::WndProcThunk")); + switch (message) { case kMsgHaveWork: reinterpret_cast<MessagePumpForUI*>(wparam)->HandleWorkMessage(); diff --git a/base/power_monitor/power_monitor_device_source_win.cc b/base/power_monitor/power_monitor_device_source_win.cc index b8b16e1..0e199dc 100644 --- a/base/power_monitor/power_monitor_device_source_win.cc +++ b/base/power_monitor/power_monitor_device_source_win.cc @@ -5,6 +5,7 @@ #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor_device_source.h" #include "base/power_monitor/power_monitor_source.h" +#include "base/profiler/scoped_tracker.h" #include "base/win/wrapped_window_proc.h" namespace base { @@ -98,6 +99,11 @@ LRESULT CALLBACK PowerMonitorDeviceSource::PowerMessageWindow::WndProcThunk( UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "440919 PowerMonitorDeviceSource::PowerMessageWindow::WndProcThunk")); + switch (message) { case WM_POWERBROADCAST: ProcessWmPowerBroadcastMessage(wparam); diff --git a/base/win/message_window.cc b/base/win/message_window.cc index 57fe64c..0b4b29f 100644 --- a/base/win/message_window.cc +++ b/base/win/message_window.cc @@ -7,6 +7,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/process/memory.h" +#include "base/profiler/scoped_tracker.h" #include "base/win/wrapped_window_proc.h" const wchar_t kMessageWindowClassName[] = L"Chrome_MessageWindow"; @@ -120,6 +121,10 @@ LRESULT CALLBACK MessageWindow::WindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 MessageWindow::WindowProc")); + MessageWindow* self = reinterpret_cast<MessageWindow*>( GetWindowLongPtr(hwnd, GWLP_USERDATA)); diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc index 44148d5..54df3e4 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc @@ -7,6 +7,7 @@ #include <commctrl.h> #include "base/bind.h" +#include "base/profiler/scoped_tracker.h" #include "base/threading/non_thread_safe.h" #include "base/threading/thread.h" #include "base/win/wrapped_window_proc.h" @@ -138,6 +139,10 @@ LRESULT CALLBACK StatusTrayWin::WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 StatusTrayWin::WndProcStatic")); + StatusTrayWin* msg_wnd = reinterpret_cast<StatusTrayWin*>( GetWindowLongPtr(hwnd, GWLP_USERDATA)); if (msg_wnd) diff --git a/components/browser_watcher/endsession_watcher_window_win.cc b/components/browser_watcher/endsession_watcher_window_win.cc index a484702..afd23c1 100644 --- a/components/browser_watcher/endsession_watcher_window_win.cc +++ b/components/browser_watcher/endsession_watcher_window_win.cc @@ -5,6 +5,7 @@ #include "components/browser_watcher/endsession_watcher_window_win.h" #include "base/logging.h" +#include "base/profiler/scoped_tracker.h" #include "base/win/wrapped_window_proc.h" namespace browser_watcher { @@ -52,6 +53,11 @@ LRESULT CALLBACK EndSessionWatcherWindow::WndProcThunk(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "440919 EndSessionWatcherWindow::WndProcThunk")); + EndSessionWatcherWindow* msg_wnd = reinterpret_cast<EndSessionWatcherWindow*>( ::GetWindowLongPtr(hwnd, GWLP_USERDATA)); diff --git a/components/storage_monitor/storage_monitor_win.cc b/components/storage_monitor/storage_monitor_win.cc index 95a6911..8c672d3 100644 --- a/components/storage_monitor/storage_monitor_win.cc +++ b/components/storage_monitor/storage_monitor_win.cc @@ -9,6 +9,7 @@ #include <fileapi.h> #include <shlobj.h> +#include "base/profiler/scoped_tracker.h" #include "base/win/wrapped_window_proc.h" #include "components/storage_monitor/portable_device_watcher_win.h" #include "components/storage_monitor/removable_device_constants.h" @@ -132,6 +133,11 @@ bool StorageMonitorWin::GetMTPStorageInfoFromDeviceId( // static LRESULT CALLBACK StorageMonitorWin::WndProcThunk(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "440919 StorageMonitorWin::WndProcThunk")); + StorageMonitorWin* msg_wnd = reinterpret_cast<StorageMonitorWin*>( GetWindowLongPtr(hwnd, GWLP_USERDATA)); if (msg_wnd) diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc index 3aacfdf..d75d89a 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc @@ -5,6 +5,7 @@ #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "base/logging.h" +#include "base/profiler/scoped_tracker.h" #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h" @@ -83,6 +84,10 @@ void NotifyPluginProcessHostHelper(HWND window, HWND parent, int tries) { // parent which is typically the RVH window which turns on user gesture. LRESULT CALLBACK PluginWrapperWindowProc(HWND window, unsigned int message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 PluginWrapperWindowProc")); + if (message == WM_PARENTNOTIFY) { switch (LOWORD(wparam)) { case WM_LBUTTONDOWN: diff --git a/content/browser/system_message_window_win.h b/content/browser/system_message_window_win.h index b29bad5..a067e25 100644 --- a/content/browser/system_message_window_win.h +++ b/content/browser/system_message_window_win.h @@ -9,6 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" +#include "base/profiler/scoped_tracker.h" #include "content/common/content_export.h" namespace content { @@ -31,6 +32,11 @@ class CONTENT_EXPORT SystemMessageWindowWin { UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "440919 SystemMessageWindowWin::WndProcThunk")); + SystemMessageWindowWin* msg_wnd = reinterpret_cast<SystemMessageWindowWin*>( GetWindowLongPtr(hwnd, GWLP_USERDATA)); if (msg_wnd) diff --git a/ui/gfx/win/window_impl.cc b/ui/gfx/win/window_impl.cc index e267f72..94e315c 100644 --- a/ui/gfx/win/window_impl.cc +++ b/ui/gfx/win/window_impl.cc @@ -291,6 +291,10 @@ LRESULT CALLBACK WindowImpl::WndProc(HWND hwnd, UINT message, WPARAM w_param, LPARAM l_param) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 WindowImpl::WndProc")); + if (message == WM_NCCREATE) { CREATESTRUCT* cs = reinterpret_cast<CREATESTRUCT*>(l_param); WindowImpl* window = reinterpret_cast<WindowImpl*>(cs->lpCreateParams); diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc index a3930f2..fa8a3e6 100644 --- a/ui/views/controls/menu/native_menu_win.cc +++ b/ui/views/controls/menu/native_menu_win.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" +#include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/win/wrapped_window_proc.h" @@ -345,6 +346,10 @@ class NativeMenuWin::MenuHostWindow { UINT message, WPARAM w_param, LPARAM l_param) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 MenuHostWindowProc")); + MenuHostWindow* host = reinterpret_cast<MenuHostWindow*>(gfx::GetWindowUserData(window)); // host is null during initial construction. diff --git a/win8/metro_driver/metro_driver_win7.cc b/win8/metro_driver/metro_driver_win7.cc index 7ae32cc..d5496d6 100644 --- a/win8/metro_driver/metro_driver_win7.cc +++ b/win8/metro_driver/metro_driver_win7.cc @@ -7,6 +7,7 @@ #include <shobjidl.h> #include "base/logging.h" +#include "base/profiler/scoped_tracker.h" #include "ui/gfx/geometry/safe_integer_conversions.h" #include "ui/gfx/win/msg_util.h" @@ -1004,6 +1005,10 @@ class CoreWindowEmulation LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 MetroDriver WndProc")); + PAINTSTRUCT ps; HDC hdc; switch (message) { |