Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590

Change-Id: Id521afd66935db6149a341f89ab6b4d7440e4695
2010-05-12 14:09:26 +01:00
parent edb8628b41
commit 3b6f45dbd2
16 changed files with 42 additions and 42 deletions
--- a/samples/BrowserPlugin/jni/video/VideoPlugin.cpp
+++ b/samples/BrowserPlugin/jni/video/VideoPlugin.cpp
@@ -103,7 +103,7 @@ void VideoPlugin::destroySurface() {
    }
 }

-int16 VideoPlugin::handleEvent(const ANPEvent* evt) {
+int16_t VideoPlugin::handleEvent(const ANPEvent* evt) {
    switch (evt->eventType) {
        case kLifecycle_ANPEventType: {
            switch (evt->data.lifecycle.action) {