Merge Webkit at r58956: Update plugin code to use C99 types. See http://trac.webkit.org/changeset/58590

Change-Id: I73f3f008a88e69962de831a98d40e8d23c3cce30

10 files changed, 29 insertions, 29 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);
 }
diff --git a/WebKit/android/plugins/PluginDebugAndroid.cpp b/WebKit/android/plugins/PluginDebugAndroid.cpp
index e13e928..0388d4b 100644
--- a/WebKit/android/plugins/PluginDebugAndroid.cpp
+++ b/WebKit/android/plugins/PluginDebugAndroid.cpp
@@ -60,7 +60,7 @@ void anp_logPlugin(const char format[], ...) {
     va_end(args);
 }
 
-void anp_logPluginEvent(void* npp, const ANPEvent* evt, int16 returnVal, int elapsedTime) {
+void anp_logPluginEvent(void* npp, const ANPEvent* evt, int16_t returnVal, int elapsedTime) {
 
     switch(evt->eventType) {
 
diff --git a/WebKit/android/plugins/PluginTimer.cpp b/WebKit/android/plugins/PluginTimer.cpp
index a813d25..ae7cb84 100644
--- a/WebKit/android/plugins/PluginTimer.cpp
+++ b/WebKit/android/plugins/PluginTimer.cpp
@@ -29,10 +29,10 @@
 
 namespace WebCore {
 
-    static uint32 gTimerID;
+    static uint32_t gTimerID;
 
     PluginTimer::PluginTimer(PluginTimer** list, NPP instance, bool repeat,
-                             void (*timerFunc)(NPP npp, uint32 timerID))
+                             void (*timerFunc)(NPP npp, uint32_t timerID))
                 : m_list(list),
                   m_instance(instance),
                   m_timerFunc(timerFunc),
@@ -71,7 +71,7 @@ namespace WebCore {
     }
     
     // may return null if timerID is not found
-    PluginTimer* PluginTimer::Find(PluginTimer* list, uint32 timerID)
+    PluginTimer* PluginTimer::Find(PluginTimer* list, uint32_t timerID)
     {
         PluginTimer* curr = list;
         while (curr) {
@@ -92,8 +92,8 @@ namespace WebCore {
         }
     }
 
-    uint32 PluginTimerList::schedule(NPP instance, uint32 interval, bool repeat,
-                                     void (*proc)(NPP npp, uint32 timerID))
+    uint32_t PluginTimerList::schedule(NPP instance, uint32_t interval, bool repeat,
+                                     void (*proc)(NPP npp, uint32_t timerID))
     {        
         PluginTimer* timer = new PluginTimer(&m_list, instance, repeat, proc);
         
@@ -106,7 +106,7 @@ namespace WebCore {
         return timer->timerID();
     }
     
-    void PluginTimerList::unschedule(NPP instance, uint32 timerID)
+    void PluginTimerList::unschedule(NPP instance, uint32_t timerID)
     {
         // Although it looks like simply deleting the timer would work here
         // (stop() will be executed by the dtor), we cannot do this, as
diff --git a/WebKit/android/plugins/PluginTimer.h b/WebKit/android/plugins/PluginTimer.h
index 2ffe437..dcb29bf 100644
--- a/WebKit/android/plugins/PluginTimer.h
+++ b/WebKit/android/plugins/PluginTimer.h
@@ -37,14 +37,14 @@ namespace WebCore {
     class PluginTimer : public TimerBase {
     public:
         PluginTimer(PluginTimer** list, NPP instance, bool repeat,
-                    void (*proc)(NPP npp, uint32 timerID));
+                    void (*proc)(NPP npp, uint32_t timerID));
         virtual ~PluginTimer();
     
-        uint32 timerID() const { return m_timerID; }
+        uint32_t timerID() const { return m_timerID; }
 
         void unschedule() { m_unscheduled = true; }
 
-        static PluginTimer* Find(PluginTimer* list, uint32 timerID);
+        static PluginTimer* Find(PluginTimer* list, uint32_t timerID);
 
     private:
         // override from TimerBase
@@ -57,8 +57,8 @@ namespace WebCore {
         PluginTimer*    m_prev;
         PluginTimer*    m_next;
         NPP             m_instance;
-        void            (*m_timerFunc)(NPP, uint32);
-        uint32          m_timerID;
+        void            (*m_timerFunc)(NPP, uint32_t);
+        uint32_t          m_timerID;
         bool            m_repeat;
         bool            m_unscheduled;
     };
@@ -68,9 +68,9 @@ namespace WebCore {
         PluginTimerList() : m_list(0) {}
         ~PluginTimerList();
         
-        uint32 schedule(NPP instance, uint32 interval, bool repeat,
-                        void (*proc)(NPP npp, uint32 timerID));
-        void unschedule(NPP instance, uint32 timerID);
+        uint32_t schedule(NPP instance, uint32_t interval, bool repeat,
+                        void (*proc)(NPP npp, uint32_t timerID));
+        void unschedule(NPP instance, uint32_t timerID);
         
     private:
         PluginTimer* m_list;
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index c5a1f5b..b90b53b 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -275,7 +275,7 @@ void PluginWidgetAndroid::layoutSurface(bool pluginBoundsChanged) {
     }
 }
 
-int16 PluginWidgetAndroid::sendEvent(const ANPEvent& evt) {
+int16_t PluginWidgetAndroid::sendEvent(const ANPEvent& evt) {
     if (!m_acceptEvents)
         return 0;
     WebCore::PluginPackage* pkg = m_pluginView->plugin();
@@ -297,7 +297,7 @@ int16 PluginWidgetAndroid::sendEvent(const ANPEvent& evt) {
         // make a localCopy since the actual plugin may not respect its constness,
         // and so we don't want our caller to have its param modified
         ANPEvent localCopy = evt;
-        int16 result = pkg->pluginFuncs()->event(instance, &localCopy);
+        int16_t result = pkg->pluginFuncs()->event(instance, &localCopy);
 
 #if DEBUG_EVENTS
         SkMSec endTime = SkTime::GetMSecs();
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.h b/WebKit/android/plugins/PluginWidgetAndroid.h
index 2e55aaa..162fb1d 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.h
+++ b/WebKit/android/plugins/PluginWidgetAndroid.h
@@ -97,7 +97,7 @@ struct PluginWidgetAndroid {
     /*  Send this event to the plugin instance. A non-zero value will be
         returned if the plugin handled the event.
      */
-    int16 sendEvent(const ANPEvent&);
+    int16_t sendEvent(const ANPEvent&);
 
     /*  Update the plugins event flags. If a flag is set to true then the plugin
         wants to be notified of events of this type.