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

Unified Diff: webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc

Issue 12298002: Make npapi_test_plugin build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc
===================================================================
--- webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc (revision 183008)
+++ webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc (working copy)
@@ -39,8 +39,8 @@
}
void CALLBACK NPObjectLifetimeTest::TimerProc(
- HWND window, UINT message, UINT timer_id,
- unsigned long elapsed_milli_seconds) {
+ HWND window, UINT message, UINT_PTR timer_id,
+ DWORD elapsed_milli_seconds) {
NPObjectLifetimeTest* this_instance =
reinterpret_cast<NPObjectLifetimeTest*>
@@ -135,14 +135,14 @@
// http://b/issue?id=1134683.
if (!timer_id_) {
timer_id_ = SetTimer(window_handle, kNPObjectLifetimeTimer,
- kNPObjectLifetimeTimerElapse, TimerProc);
+ kNPObjectLifetimeTimerElapse, TimerProc);
}
return NPERR_NO_ERROR;
}
void CALLBACK NPObjectDeletePluginInNPN_Evaluate::TimerProc(
- HWND window, UINT message, UINT timer_id,
- unsigned long elapsed_milli_seconds) {
+ HWND window, UINT message, UINT_PTR timer_id,
+ DWORD elapsed_milli_seconds) {
KillTimer(window, g_npn_evaluate_test_instance_->timer_id_);
g_npn_evaluate_test_instance_->timer_id_ = 0;
« no previous file with comments | « webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698