| commit | 3b6f45dbd2a69e4e4368e5e7cbd97be1960fec96 | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Wed May 12 14:09:26 2010 +0100 |
| committer | Ben Murdoch <benm@google.com> | Fri May 14 10:24:06 2010 +0100 |
| tree | 7d5dd7df8b24f72d79db1fa26e0e78b012a24a0e | |
| parent | edb8628b415398ac1dd0f1ca049cd821e23ea121 [diff] [blame] |
Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590 Change-Id: Id521afd66935db6149a341f89ab6b4d7440e4695
diff --git a/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp b/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp index 71b9f24..abe6805 100644 --- a/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp +++ b/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp
@@ -273,7 +273,7 @@ } } -int16 PaintPlugin::handleEvent(const ANPEvent* evt) { +int16_t PaintPlugin::handleEvent(const ANPEvent* evt) { switch (evt->eventType) { case kTouch_ANPEventType: { float x = (float) evt->data.touch.x;