| commit | ccee91085913ccb486b063616afae13b53b2e92b | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Wed May 12 14:15:31 2010 +0100 |
| committer | Ben Murdoch <benm@google.com> | Fri May 14 10:24:45 2010 +0100 |
| tree | 272e3cc4311b873e22070992c613859818e76cc7 | |
| parent | e26867793b6a0c226e02f7da880b06efbcb8707e [diff] [blame] |
Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590 Change-Id: I82798d5af062219a73864c3c3b59a217e882e2a5
diff --git a/tests/BrowserTestPlugin/jni/PluginObject.h b/tests/BrowserTestPlugin/jni/PluginObject.h index a058d4a..037367e 100644 --- a/tests/BrowserTestPlugin/jni/PluginObject.h +++ b/tests/BrowserTestPlugin/jni/PluginObject.h
@@ -65,7 +65,7 @@ public: SubPlugin(NPP inst) : m_inst(inst) {} virtual ~SubPlugin() {} - virtual int16 handleEvent(const ANPEvent* evt) = 0; + virtual int16_t handleEvent(const ANPEvent* evt) = 0; NPP inst() const { return m_inst; }