diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp index a3c6773..e960a06 100644 --- a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp +++ b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp @@ -171,7 +171,7 @@ webkit_test_plugin_new_stream(NPP instance, NPMIMEType /*type*/, NPStream *stream, NPBool /*seekable*/, - uint16* stype) + uint16_t* stype) { PluginObject* obj = static_cast<PluginObject*>(instance->pdata); obj->stream = stream; @@ -210,13 +210,13 @@ webkit_test_plugin_stream_as_file(NPP /*instance*/, NPStream* /*stream*/, const { } -static int32 +static int32_t webkit_test_plugin_write_ready(NPP /*instance*/, NPStream* /*stream*/) { return 0; } -static int32 +static int32_t webkit_test_plugin_write(NPP /*instance*/, NPStream* /*stream*/, int32_t /*offset*/, |