diff options
author | Ben Murdoch <benm@google.com> | 2010-05-12 12:09:29 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-05-14 12:25:48 +0100 |
commit | c02eba192362e2ea83fdfbe0be51a08429ec4123 (patch) | |
tree | 763c815c9eaab8e4a2c5cf7f1175328bcd25d861 /WebCore | |
parent | 88a30a51ea8b4aa85ab99022c9244e25c16623ad (diff) | |
download | external_webkit-c02eba192362e2ea83fdfbe0be51a08429ec4123.zip external_webkit-c02eba192362e2ea83fdfbe0be51a08429ec4123.tar.gz external_webkit-c02eba192362e2ea83fdfbe0be51a08429ec4123.tar.bz2 |
Merge Webkit at r58956: Update plugin code to use C99 types. See http://trac.webkit.org/changeset/58590
Change-Id: I73f3f008a88e69962de831a98d40e8d23c3cce30
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/plugins/PluginView.cpp | 6 | ||||
-rw-r--r-- | WebCore/plugins/PluginView.h | 6 | ||||
-rw-r--r-- | WebCore/plugins/android/PluginPackageAndroid.cpp | 2 | ||||
-rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 2 | ||||
-rw-r--r-- | WebCore/plugins/npapi.cpp | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index b9eca2a..da01a43 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -1292,13 +1292,13 @@ NPError PluginView::handlePost(const char* url, const char* target, uint32_t len } #ifdef PLUGIN_SCHEDULE_TIMER -uint32 PluginView::scheduleTimer(NPP instance, uint32 interval, bool repeat, - void (*timerFunc)(NPP, uint32 timerID)) +uint32_t PluginView::scheduleTimer(NPP instance, uint32_t interval, bool repeat, + void (*timerFunc)(NPP, uint32_t timerID)) { return m_timerList.schedule(instance, interval, repeat, timerFunc); } -void PluginView::unscheduleTimer(NPP instance, uint32 timerID) +void PluginView::unscheduleTimer(NPP instance, uint32_t timerID) { m_timerList.unschedule(instance, timerID); } diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 6042b0f..88136e3 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -171,9 +171,9 @@ namespace WebCore { void pushPopupsEnabledState(bool state); void popPopupsEnabledState(); #ifdef PLUGIN_SCHEDULE_TIMER - uint32 scheduleTimer(NPP, uint32 interval, bool repeat, - void (*timerFunc)(NPP, uint32 timerID)); - void unscheduleTimer(NPP, uint32 timerID); + uint32_t scheduleTimer(NPP, uint32_t interval, bool repeat, + void (*timerFunc)(NPP, uint32_t timerID)); + void unscheduleTimer(NPP, uint32_t timerID); #endif virtual void invalidateRect(const IntRect&); diff --git a/WebCore/plugins/android/PluginPackageAndroid.cpp b/WebCore/plugins/android/PluginPackageAndroid.cpp index a48eca0..97ec624 100644 --- a/WebCore/plugins/android/PluginPackageAndroid.cpp +++ b/WebCore/plugins/android/PluginPackageAndroid.cpp @@ -407,7 +407,7 @@ bool PluginPackage::equal(const PluginPackage& a, const PluginPackage& b) return true; } -uint16 PluginPackage::NPVersion() const +uint16_t PluginPackage::NPVersion() const { return NP_VERSION_MINOR; } diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp index c6fbdbe..ab6d365 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -357,7 +357,7 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) } } -NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const char* buf) +NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32_t len, const char* buf) { notImplemented(); return NPERR_GENERIC_ERROR; diff --git a/WebCore/plugins/npapi.cpp b/WebCore/plugins/npapi.cpp index d5ab757..99eea32 100644 --- a/WebCore/plugins/npapi.cpp +++ b/WebCore/plugins/npapi.cpp @@ -177,14 +177,14 @@ void NPN_PluginThreadAsyncCall(NPP instance, void (*func) (void *), void *userDa } #ifdef PLUGIN_SCHEDULE_TIMER -uint32 NPN_ScheduleTimer(NPP instance, uint32 interval, NPBool repeat, - void (*timerFunc)(NPP npp, uint32 timerID)) +uint32_t NPN_ScheduleTimer(NPP instance, uint32_t interval, NPBool repeat, + void (*timerFunc)(NPP npp, uint32_t timerID)) { return pluginViewForInstance(instance)->scheduleTimer(instance, interval, repeat != 0, timerFunc); } -void NPN_UnscheduleTimer(NPP instance, uint32 timerID) +void NPN_UnscheduleTimer(NPP instance, uint32_t timerID) { pluginViewForInstance(instance)->unscheduleTimer(instance, timerID); } |