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

Side by Side Diff: content/child/npapi/webplugin_delegate_impl_win.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 "content/child/npapi/webplugin_delegate_impl.h" 5 #include "content/child/npapi/webplugin_delegate_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 base::TimeDelta::FromMilliseconds(kFlashWMUSERMessageThrottleDelayMs)); 588 base::TimeDelta::FromMilliseconds(kFlashWMUSERMessageThrottleDelayMs));
589 } 589 }
590 } 590 }
591 591
592 // Schedule a windows message for delivery later. 592 // Schedule a windows message for delivery later.
593 // static 593 // static
594 void WebPluginDelegateImpl::ThrottleMessage(WNDPROC proc, HWND hwnd, 594 void WebPluginDelegateImpl::ThrottleMessage(WNDPROC proc, HWND hwnd,
595 UINT message, WPARAM wParam, 595 UINT message, WPARAM wParam,
596 LPARAM lParam) { 596 LPARAM lParam) {
597 MSG msg; 597 MSG msg;
598 msg.time = reinterpret_cast<DWORD>(proc); 598 // Cast through uintptr_t and then DWORD to make the truncation explicit.
599 msg.time = static_cast<DWORD>(reinterpret_cast<uintptr_t>(proc));
599 msg.hwnd = hwnd; 600 msg.hwnd = hwnd;
600 msg.message = message; 601 msg.message = message;
601 msg.wParam = wParam; 602 msg.wParam = wParam;
602 msg.lParam = lParam; 603 msg.lParam = lParam;
603 604
604 ThrottleQueue* throttle_queue = g_throttle_queue.Pointer(); 605 ThrottleQueue* throttle_queue = g_throttle_queue.Pointer();
605 606
606 throttle_queue->push_back(msg); 607 throttle_queue->push_back(msg);
607 608
608 if (throttle_queue->size() == 1) { 609 if (throttle_queue->size() == 1) {
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 case WM_RBUTTONUP: 1484 case WM_RBUTTONUP:
1484 ::ReleaseCapture(); 1485 ::ReleaseCapture();
1485 break; 1486 break;
1486 1487
1487 default: 1488 default:
1488 break; 1489 break;
1489 } 1490 }
1490 } 1491 }
1491 1492
1492 } // namespace content 1493 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698