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; |