diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKitExamplePlugins | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKitExamplePlugins')
| -rw-r--r-- | WebKitExamplePlugins/ChangeLog | 10 | ||||
| -rw-r--r-- | WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m | 18 |
2 files changed, 19 insertions, 9 deletions
diff --git a/WebKitExamplePlugins/ChangeLog b/WebKitExamplePlugins/ChangeLog index 07c3d8e..724bf26 100644 --- a/WebKitExamplePlugins/ChangeLog +++ b/WebKitExamplePlugins/ChangeLog @@ -1,3 +1,13 @@ +2010-06-16 Anders Carlsson <andersca@apple.com> + + Fix build. + + * NetscapeCoreAnimationMoviePlugin/main.m: + (NPP_New): + (NPP_WriteReady): + (NPP_Write): + (NPP_HandleEvent): + 2010-06-10 Anders Carlsson <andersca@apple.com> Fix build. diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m index 6766bc6..b23283f 100644 --- a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m +++ b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m @@ -72,16 +72,16 @@ typedef struct PluginObject QTMovie *movie; } PluginObject; -NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved); +NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved); NPError NPP_Destroy(NPP instance, NPSavedData** save); NPError NPP_SetWindow(NPP instance, NPWindow* window); NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype); NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason); -int32 NPP_WriteReady(NPP instance, NPStream* stream); -int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer); +int32_t NPP_WriteReady(NPP instance, NPStream* stream); +int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer); void NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname); void NPP_Print(NPP instance, NPPrint* platformPrint); -int16 NPP_HandleEvent(NPP instance, void* event); +int16_t NPP_HandleEvent(NPP instance, void* event); void NPP_URLNotify(NPP instance, const char* URL, NPReason reason, void* notifyData); NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value); NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value); @@ -125,7 +125,7 @@ void NP_Shutdown(void) } -NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved) +NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved) { // Create per-instance storage PluginObject *obj = (PluginObject *)malloc(sizeof(PluginObject)); @@ -155,7 +155,7 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, ch browser->setvalue(instance, NPPVpluginEventModel, (void *)NPEventModelCocoa); - for (int16 i = 0; i < argc; i++) { + for (int16_t i = 0; i < argc; i++) { if (strcasecmp(argn[i], "movieurl") == 0) { NSString *urlString = [NSString stringWithUTF8String:argv[i]]; if (urlString) @@ -201,12 +201,12 @@ NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason) return NPERR_NO_ERROR; } -int32 NPP_WriteReady(NPP instance, NPStream* stream) +int32_t NPP_WriteReady(NPP instance, NPStream* stream) { return 0; } -int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer) +int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer) { return 0; } @@ -309,7 +309,7 @@ static int handleScrollEvent(PluginObject *obj, NPCocoaEvent *event) -int16 NPP_HandleEvent(NPP instance, void* event) +int16_t NPP_HandleEvent(NPP instance, void* event) { PluginObject *obj = instance->pdata; |