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 /WebKit/android/plugins | |
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 'WebKit/android/plugins')
-rw-r--r-- | WebKit/android/plugins/PluginDebugAndroid.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/plugins/PluginTimer.cpp | 12 | ||||
-rw-r--r-- | WebKit/android/plugins/PluginTimer.h | 16 | ||||
-rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.cpp | 4 | ||||
-rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.h | 2 |
5 files changed, 18 insertions, 18 deletions
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. |