3 files changed, 15 insertions, 16 deletions

diff --git a/Source/WebKit/android/plugins/ANPSoundInterface.cpp b/Source/WebKit/android/plugins/ANPSoundInterface.cpp
index 9d19443..c238872 100644
--- a/Source/WebKit/android/plugins/ANPSoundInterface.cpp
+++ b/Source/WebKit/android/plugins/ANPSoundInterface.cpp
@@ -38,7 +38,7 @@ struct ANPAudioTrack {
     android::AudioTrack* mTrack;
 };
 
-static ANPSampleFormat toANPFormat(audio_format_t fm) {
+static ANPSampleFormat toANPFormat(int fm) {
     switch (fm) {
         case AUDIO_FORMAT_PCM_16_BIT:
             return kPCM16Bit_ANPSampleFormat;
@@ -49,7 +49,7 @@ static ANPSampleFormat toANPFormat(audio_format_t fm) {
     }
 }
 
-static audio_format_t fromANPFormat(ANPSampleFormat fm) {
+static int fromANPFormat(ANPSampleFormat fm) {
     switch (fm) {
         case kPCM16Bit_ANPSampleFormat:
             return AUDIO_FORMAT_PCM_16_BIT;
@@ -71,7 +71,7 @@ static void callbackProc(int event, void* user, void* info) {
             src = reinterpret_cast<android::AudioTrack::Buffer*>(info);
             dst.bufferData      = src->raw;
             dst.channelCount    = src->channelCount;
-            dst.format          = toANPFormat((audio_format_t) src->format);
+            dst.format          = toANPFormat(src->format);
             dst.size            = src->size;
             track->mProc(kMoreData_ANPAudioEvent, track->mUser, &dst);
             // return the updated size field
@@ -102,7 +102,7 @@ static ANPAudioTrack* ANPCreateTrack(uint32_t sampleRate,
                                             fromANPFormat(format),
                                             (channelCount > 1) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,
                                             0,  // frameCount
-                                            (audio_output_flags_t) 0, // AUDIO_OUTPUT_FLAG_NONE,
+                                            0,  // flags
                                             callbackProc,
                                             track,
                                             0);
diff --git a/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp b/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp
index 92dbbcd..4b99b31 100644
--- a/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp
+++ b/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp
@@ -32,7 +32,7 @@
 #include "SkANP.h"
 #include "android_graphics.h"
 #include <JNIUtility.h>
-#include <gui/Surface.h>
+#include <surfaceflinger/Surface.h>
 #include <ui/Rect.h>
 #include <ui/Region.h>
 #include <utils/RefBase.h>
@@ -47,7 +47,7 @@ static struct ANPSurfaceInterfaceJavaGlue {
     jfieldID    surfacePointer;
 } gSurfaceJavaGlue;
 
-static inline sp<android::Surface> getSurface(JNIEnv* env, jobject view) {
+static inline sp<Surface> getSurface(JNIEnv* env, jobject view) {
     if (!env || !view) {
         return NULL;
     }
@@ -80,7 +80,7 @@ static inline sp<android::Surface> getSurface(JNIEnv* env, jobject view) {
     env->DeleteLocalRef(holder);
     env->DeleteLocalRef(surface);
 
-    return sp<android::Surface>((android::Surface*) surfacePointer);
+    return sp<Surface>((Surface*) surfacePointer);
 }
 
 static inline ANPBitmapFormat convertPixelFormat(PixelFormat format) {
@@ -96,9 +96,9 @@ static bool anp_lock(JNIEnv* env, jobject surfaceView, ANPBitmap* bitmap, ANPRec
         return false;
     }
 
-    sp<android::Surface> surface = getSurface(env, surfaceView);
+    sp<Surface> surface = getSurface(env, surfaceView);
 
-    if (!bitmap || !android::Surface::isValid(surface)) {
+    if (!bitmap || !Surface::isValid(surface)) {
             return false;
     }
 
@@ -112,7 +112,7 @@ static bool anp_lock(JNIEnv* env, jobject surfaceView, ANPBitmap* bitmap, ANPRec
         dirtyRegion.set(Rect(0x3FFF, 0x3FFF));
     }
 
-    android::Surface::SurfaceInfo info;
+    Surface::SurfaceInfo info;
     status_t err = surface->lock(&info, &dirtyRegion);
     if (err < 0) {
         return false;
@@ -150,9 +150,9 @@ static void anp_unlock(JNIEnv* env, jobject surfaceView) {
         return;
     }
 
-    sp<android::Surface> surface = getSurface(env, surfaceView);
+    sp<Surface> surface = getSurface(env, surfaceView);
 
-    if (!android::Surface::isValid(surface)) {
+    if (!Surface::isValid(surface)) {
         return;
     }
 
diff --git a/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp b/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 09bb24e..fc98837 100644
--- a/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -160,8 +160,7 @@ bool PluginWidgetAndroid::setDrawingModel(ANPDrawingModel model) {
 
     if (model == kOpenGL_ANPDrawingModel && m_layer == 0) {
         jobject webview = m_core->getWebViewJavaObject();
-        AutoJObject webViewCore = m_core->getJavaObject();
-        m_layer = new WebCore::MediaLayer(webview, webViewCore.get());
+        m_layer = new WebCore::MediaLayer(webview);
     }
     else if (model != kOpenGL_ANPDrawingModel && m_layer != 0) {
         m_layer->unref();
@@ -597,9 +596,9 @@ void PluginWidgetAndroid::scrollToVisiblePluginRect() {
     android::WebViewCore* core = android::WebViewCore::getWebViewCore(scrollView);
 #if DEBUG_VISIBLE_RECTS
     PLUGIN_LOG("%s call scrollTo (%d,%d) to center (%d,%d)", __FUNCTION__,
-            scrollDocX, scrollDocY, rectCenterX, rectCenterY);
+            scrollDocX, scrollDocX, rectCenterX, rectCenterY);
 #endif
-    core->scrollTo(scrollDocX, scrollDocY, true);
+    core->scrollTo(scrollDocX, scrollDocX, true);
 }
 
 void PluginWidgetAndroid::requestFullScreen() {