Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: chrome/browser/hang_monitor/hung_window_detector.cc

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to latest Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/hang_monitor/hung_window_detector.h" 5 #include "chrome/browser/hang_monitor/hung_window_detector.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <atlbase.h> 8 #include <atlbase.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 DWORD child_window_process_id = 0; 82 DWORD child_window_process_id = 0;
83 DWORD child_window_thread_id = 83 DWORD child_window_thread_id =
84 GetWindowThreadProcessId(child_window, &child_window_process_id); 84 GetWindowThreadProcessId(child_window, &child_window_process_id);
85 bool continue_hang_detection = true; 85 bool continue_hang_detection = true;
86 86
87 if (top_level_window_thread_id != child_window_thread_id) { 87 if (top_level_window_thread_id != child_window_thread_id) {
88 // The message timeout for a child window starts of with a default 88 // The message timeout for a child window starts of with a default
89 // value specified by the message_response_timeout_ member. It is 89 // value specified by the message_response_timeout_ member. It is
90 // tracked by a property on the child window. 90 // tracked by a property on the child window.
91 #pragma warning(disable:4311) 91 #pragma warning(disable : 4311 4302)
92 int child_window_message_timeout = 92 int child_window_message_timeout =
93 reinterpret_cast<int>(GetProp(child_window, kHungChildWindowTimeout)); 93 reinterpret_cast<int>(GetProp(child_window, kHungChildWindowTimeout));
94 #pragma warning(default:4311) 94 #pragma warning(default : 4311 4302)
95 if (!child_window_message_timeout) { 95 if (!child_window_message_timeout) {
96 child_window_message_timeout = message_response_timeout_; 96 child_window_message_timeout = message_response_timeout_;
97 } 97 }
98 98
99 DWORD_PTR result = 0; 99 DWORD_PTR result = 0;
100 if (0 == SendMessageTimeout(child_window, 100 if (0 == SendMessageTimeout(child_window,
101 WM_NULL, 101 WM_NULL,
102 0, 102 0,
103 0, 103 0,
104 SMTO_BLOCK, 104 SMTO_BLOCK,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 LPARAM param) { 152 LPARAM param) {
153 HungWindowDetector* detector_instance = 153 HungWindowDetector* detector_instance =
154 reinterpret_cast<HungWindowDetector*>(param); 154 reinterpret_cast<HungWindowDetector*>(param);
155 if (NULL == detector_instance) { 155 if (NULL == detector_instance) {
156 NOTREACHED(); 156 NOTREACHED();
157 return FALSE; 157 return FALSE;
158 } 158 }
159 159
160 return detector_instance->CheckChildWindow(child_window); 160 return detector_instance->CheckChildWindow(child_window);
161 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698