summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/plugins/PluginView.cpp6
-rw-r--r--WebCore/plugins/PluginView.h6
-rw-r--r--WebCore/plugins/android/PluginPackageAndroid.cpp2
-rw-r--r--WebCore/plugins/android/PluginViewAndroid.cpp2
-rw-r--r--WebCore/plugins/npapi.cpp6
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);
}