summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebViewCore.cpp
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2009-08-06 10:43:25 -0400
committerDerek Sollenberger <djsollen@google.com>2009-08-06 10:43:25 -0400
commiteab880ad54e75ed123123ba131fbf82099c7c270 (patch)
treed7853d3aba00193190d2997356a14314aad3e505 /WebKit/android/jni/WebViewCore.cpp
parent243869ecee2d4b5ab0f796fcc6692ece5b03c15e (diff)
downloadexternal_webkit-eab880ad54e75ed123123ba131fbf82099c7c270.zip
external_webkit-eab880ad54e75ed123123ba131fbf82099c7c270.tar.gz
external_webkit-eab880ad54e75ed123123ba131fbf82099c7c270.tar.bz2
fixing the surface size if the plugin elects to not handle zoomEvents.
Diffstat (limited to 'WebKit/android/jni/WebViewCore.cpp')
-rw-r--r--WebKit/android/jni/WebViewCore.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 35aeedb..e743eff 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -254,7 +254,7 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
m_javaGlue->m_geolocationPermissionsShowPrompt = GetJMethod(env, clazz, "geolocationPermissionsShowPrompt", "(Ljava/lang/String;)V");
m_javaGlue->m_geolocationPermissionsHidePrompt = GetJMethod(env, clazz, "geolocationPermissionsHidePrompt", "()V");
m_javaGlue->m_addMessageToConsole = GetJMethod(env, clazz, "addMessageToConsole", "(Ljava/lang/String;ILjava/lang/String;)V");
- m_javaGlue->m_createSurface = GetJMethod(env, clazz, "createSurface", "(I)Landroid/view/SurfaceView;");
+ m_javaGlue->m_createSurface = GetJMethod(env, clazz, "createSurface", "(IZ)Landroid/view/SurfaceView;");
m_javaGlue->m_destroySurface = GetJMethod(env, clazz, "destroySurface", "(Landroid/view/SurfaceView;)V");
m_javaGlue->m_attachSurface = GetJMethod(env, clazz, "attachSurface", "(Landroid/view/SurfaceView;IIII)V");
@@ -2095,11 +2095,11 @@ void WebViewCore::setBackgroundColor(SkColor c)
view->setBaseBackgroundColor(bcolor);
}
-jobject WebViewCore::createSurface(SurfaceCallback* cb)
+jobject WebViewCore::createSurface(SurfaceCallback* cb, bool isFixedSize)
{
JNIEnv* env = JSC::Bindings::getJNIEnv();
jobject surface = env->CallObjectMethod(m_javaGlue->object(env).get(),
- m_javaGlue->m_createSurface, (int) cb);
+ m_javaGlue->m_createSurface, (int) cb, isFixedSize);
checkException(env);
return surface;
}