summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/message_loop/message_pump_win.cc26
-rw-r--r--base/power_monitor/power_monitor_device_source_win.cc5
-rw-r--r--base/win/message_window.cc4
-rw-r--r--chrome/browser/ui/views/status_icons/status_tray_win.cc4
-rw-r--r--components/browser_watcher/endsession_watcher_window_win.cc5
-rw-r--r--components/storage_monitor/storage_monitor_win.cc5
-rw-r--r--content/browser/renderer_host/render_widget_host_view_base.cc4
-rw-r--r--content/browser/system_message_window_win.h5
-rw-r--r--ui/gfx/win/window_impl.cc11
-rw-r--r--ui/views/controls/menu/native_menu_win.cc4
-rw-r--r--win8/metro_driver/metro_driver_win7.cc4
11 files changed, 1 insertions, 76 deletions
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc
index 226747e..cdbf0c2 100644
--- a/base/message_loop/message_pump_win.cc
+++ b/base/message_loop/message_pump_win.cc
@@ -372,11 +372,6 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() {
}
bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "440919 MessagePumpForUI::ProcessMessageHelper1"));
-
TRACE_EVENT1("base", "MessagePumpForUI::ProcessMessageHelper",
"message", msg.message);
if (WM_QUIT == msg.message) {
@@ -391,19 +386,9 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
if (msg.message == kMsgHaveWork && msg.hwnd == message_hwnd_)
return ProcessPumpReplacementMessage();
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "440919 MessagePumpForUI::ProcessMessageHelper2"));
-
if (CallMsgFilter(const_cast<MSG*>(&msg), kMessageFilterCode))
return true;
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "440919 MessagePumpForUI::ProcessMessageHelper3"));
-
uint32_t action = MessagePumpDispatcher::POST_DISPATCH_PERFORM_DEFAULT;
if (state_->dispatcher) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
@@ -416,18 +401,7 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
if (action & MessagePumpDispatcher::POST_DISPATCH_QUIT_LOOP)
state_->should_quit = true;
if (action & MessagePumpDispatcher::POST_DISPATCH_PERFORM_DEFAULT) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
- tracked_objects::ScopedTracker tracking_profile5(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "440919 MessagePumpForUI::ProcessMessageHelper5"));
-
TranslateMessage(&msg);
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
- tracked_objects::ScopedTracker tracking_profile6(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "440919 MessagePumpForUI::ProcessMessageHelper6"));
-
DispatchMessage(&msg);
}
diff --git a/base/power_monitor/power_monitor_device_source_win.cc b/base/power_monitor/power_monitor_device_source_win.cc
index 0e199dc..69bc6aa 100644
--- a/base/power_monitor/power_monitor_device_source_win.cc
+++ b/base/power_monitor/power_monitor_device_source_win.cc
@@ -99,11 +99,6 @@ 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 0b4b29f..58010e4 100644
--- a/base/win/message_window.cc
+++ b/base/win/message_window.cc
@@ -121,10 +121,6 @@ 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 2a9c2f2..099fb6c 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -167,10 +167,6 @@ 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 ce46076..ddf9932 100644
--- a/components/browser_watcher/endsession_watcher_window_win.cc
+++ b/components/browser_watcher/endsession_watcher_window_win.cc
@@ -55,11 +55,6 @@ 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 8c672d3..dae08e8 100644
--- a/components/storage_monitor/storage_monitor_win.cc
+++ b/components/storage_monitor/storage_monitor_win.cc
@@ -133,11 +133,6 @@ 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 83f29aa..f522ef0 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -84,10 +84,6 @@ 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 a067e25..43527da 100644
--- a/content/browser/system_message_window_win.h
+++ b/content/browser/system_message_window_win.h
@@ -32,11 +32,6 @@ 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 f01f182..97da6f9 100644
--- a/ui/gfx/win/window_impl.cc
+++ b/ui/gfx/win/window_impl.cc
@@ -259,10 +259,6 @@ HICON WindowImpl::GetSmallWindowIcon() const {
}
LRESULT WindowImpl::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 WindowImpl DefWindowProc1"));
-
LRESULT result = 0;
HWND hwnd = hwnd_;
@@ -271,13 +267,8 @@ 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)) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 WindowImpl DefWindowProc2"));
-
+ if (!ProcessWindowMessage(hwnd, message, w_param, l_param, result))
result = DefWindowProc(hwnd, message, w_param, l_param);
- }
return result;
}
diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc
index 78f8a37..c29e7b5 100644
--- a/ui/views/controls/menu/native_menu_win.cc
+++ b/ui/views/controls/menu/native_menu_win.cc
@@ -346,10 +346,6 @@ 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 d34c1e0..9c4b90d 100644
--- a/win8/metro_driver/metro_driver_win7.cc
+++ b/win8/metro_driver/metro_driver_win7.cc
@@ -1001,10 +1001,6 @@ 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) {
generated by cgit v1.1 at 2024-06-07 21:51:40 +0000