 Chromium Code Reviews
 Chromium Code Reviews Issue 329863003:
  Fix accessibility in Windows x64 build.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 329863003:
  Fix accessibility in Windows x64 build.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 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 "ui/views/win/hwnd_message_handler.h" | 5 #include "ui/views/win/hwnd_message_handler.h" | 
| 6 | 6 | 
| 7 #include <dwmapi.h> | 7 #include <dwmapi.h> | 
| 8 #include <oleacc.h> | 8 #include <oleacc.h> | 
| 9 #include <shellapi.h> | 9 #include <shellapi.h> | 
| 10 #include <wtsapi32.h> | 10 #include <wtsapi32.h> | 
| (...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1408 minmax_info->ptMaxTrackSize.x = max_window_size.width(); | 1408 minmax_info->ptMaxTrackSize.x = max_window_size.width(); | 
| 1409 minmax_info->ptMaxTrackSize.y = max_window_size.height(); | 1409 minmax_info->ptMaxTrackSize.y = max_window_size.height(); | 
| 1410 } | 1410 } | 
| 1411 SetMsgHandled(FALSE); | 1411 SetMsgHandled(FALSE); | 
| 1412 } | 1412 } | 
| 1413 | 1413 | 
| 1414 LRESULT HWNDMessageHandler::OnGetObject(UINT message, | 1414 LRESULT HWNDMessageHandler::OnGetObject(UINT message, | 
| 1415 WPARAM w_param, | 1415 WPARAM w_param, | 
| 1416 LPARAM l_param) { | 1416 LPARAM l_param) { | 
| 1417 LRESULT reference_result = static_cast<LRESULT>(0L); | 1417 LRESULT reference_result = static_cast<LRESULT>(0L); | 
| 1418 // Explicitly cast to DWORD for 64-bit support. | |
| 1419 DWORD obj_id = static_cast<DWORD>(l_param); | |
| 
jschuh
2014/06/13 23:49:27
Sorry to be pedantic, but this is an undefined con
 
dmazzoni
2014/06/15 07:56:03
OK.
 | |
| 1418 | 1420 | 
| 1419 // Accessibility readers will send an OBJID_CLIENT message | 1421 // Accessibility readers will send an OBJID_CLIENT message | 
| 1420 if (OBJID_CLIENT == l_param) { | 1422 if (OBJID_CLIENT == obj_id) { | 
| 
jschuh
2014/06/13 23:49:27
This would become:
if (kObjIdClient == obj_id) {
 
dmazzoni
2014/06/15 07:56:03
Done.
 | |
| 1421 // Retrieve MSAA dispatch object for the root view. | 1423 // Retrieve MSAA dispatch object for the root view. | 
| 1422 base::win::ScopedComPtr<IAccessible> root( | 1424 base::win::ScopedComPtr<IAccessible> root( | 
| 1423 delegate_->GetNativeViewAccessible()); | 1425 delegate_->GetNativeViewAccessible()); | 
| 1424 | 1426 | 
| 1425 // Create a reference that MSAA will marshall to the client. | 1427 // Create a reference that MSAA will marshall to the client. | 
| 1426 reference_result = LresultFromObject(IID_IAccessible, w_param, | 1428 reference_result = LresultFromObject(IID_IAccessible, w_param, | 
| 1427 static_cast<IAccessible*>(root.Detach())); | 1429 static_cast<IAccessible*>(root.Detach())); | 
| 1428 } | 1430 } | 
| 1429 | 1431 | 
| 1430 return reference_result; | 1432 return reference_result; | 
| (...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2420 POINT cursor_pos = {0}; | 2422 POINT cursor_pos = {0}; | 
| 2421 ::GetCursorPos(&cursor_pos); | 2423 ::GetCursorPos(&cursor_pos); | 
| 2422 if (memcmp(&cursor_pos, &mouse_location, sizeof(POINT))) | 2424 if (memcmp(&cursor_pos, &mouse_location, sizeof(POINT))) | 
| 2423 return false; | 2425 return false; | 
| 2424 return true; | 2426 return true; | 
| 2425 } | 2427 } | 
| 2426 return false; | 2428 return false; | 
| 2427 } | 2429 } | 
| 2428 | 2430 | 
| 2429 } // namespace views | 2431 } // namespace views | 
| OLD | NEW |