diff options
| -rw-r--r-- | base/message_loop/message_pump_win.cc | 5 | ||||
| -rw-r--r-- | ui/gfx/win/singleton_hwnd.cc | 6 | ||||
| -rw-r--r-- | ui/gfx/win/window_impl.cc | 7 |
3 files changed, 17 insertions, 1 deletions
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc index 3f94c80..08f00f5 100644 --- a/base/message_loop/message_pump_win.cc +++ b/base/message_loop/message_pump_win.cc @@ -342,6 +342,11 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() { } bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "440919 MessagePumpForUI::ProcessMessageHelper")); + TRACE_EVENT1("base", "MessagePumpForUI::ProcessMessageHelper", "message", msg.message); if (WM_QUIT == msg.message) { diff --git a/ui/gfx/win/singleton_hwnd.cc b/ui/gfx/win/singleton_hwnd.cc index fc4d11f..2e2b9ab 100644 --- a/ui/gfx/win/singleton_hwnd.cc +++ b/ui/gfx/win/singleton_hwnd.cc @@ -6,6 +6,7 @@ #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" +#include "base/profiler/scoped_tracker.h" namespace gfx { @@ -30,6 +31,11 @@ BOOL SingletonHwnd::ProcessWindowMessage(HWND window, LPARAM lparam, LRESULT& result, DWORD msg_map_id) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "440919 SingletonHwnd::ProcessWindowMessage")); + FOR_EACH_OBSERVER(Observer, observer_list_, OnWndProc(window, message, wparam, lparam)); diff --git a/ui/gfx/win/window_impl.cc b/ui/gfx/win/window_impl.cc index 29b96fe..f46e638 100644 --- a/ui/gfx/win/window_impl.cc +++ b/ui/gfx/win/window_impl.cc @@ -266,8 +266,13 @@ LRESULT WindowImpl::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) { // Handle the message if it's in our message map; otherwise, let the system // handle it. - if (!ProcessWindowMessage(hwnd, message, w_param, l_param, result)) + if (!ProcessWindowMessage(hwnd, message, w_param, l_param, result)) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 WindowImpl DefWindowProc")); + result = DefWindowProc(hwnd, message, w_param, l_param); + } return result; } |