diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-06-18 16:36:33 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-06-27 15:53:05 -0700 |
| commit | 0675e22b46a05cdd3f6e20133a94bb8448231dfa (patch) | |
| tree | 46ef3d75d403aa5ed07dede8a356193c8415267e /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 4601e20f7d14b20a1063cae8cc1e87fc85baee39 (diff) | |
| download | external_webkit-0675e22b46a05cdd3f6e20133a94bb8448231dfa.zip external_webkit-0675e22b46a05cdd3f6e20133a94bb8448231dfa.tar.gz external_webkit-0675e22b46a05cdd3f6e20133a94bb8448231dfa.tar.bz2 | |
Support fullscreen to inline video transition.
Basically, player is responsible to enter fullscreen mode such that we have
the proper proxy updated on the Java side.
bug:5710646
framework change:
https://android-git.corp.google.com/g/#/c/202139/
Change-Id: Ie7adf620f2e9889142ef153e12d676a5f288bc0a
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 41f706f..88e3635 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -367,7 +367,6 @@ struct WebViewCore::JavaGlue { jmethodID m_showRect; jmethodID m_centerFitRect; jmethodID m_setScrollbarModes; - jmethodID m_enterFullscreenForVideoLayer; jmethodID m_exitFullscreenVideo; jmethodID m_setWebTextViewAutoFillable; jmethodID m_selectAt; @@ -498,7 +497,6 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m m_javaGlue->m_centerFitRect = GetJMethod(env, clazz, "centerFitRect", "(IIII)V"); m_javaGlue->m_setScrollbarModes = GetJMethod(env, clazz, "setScrollbarModes", "(II)V"); #if ENABLE(VIDEO) - m_javaGlue->m_enterFullscreenForVideoLayer = GetJMethod(env, clazz, "enterFullscreenForVideoLayer", "(ILjava/lang/String;)V"); m_javaGlue->m_exitFullscreenVideo = GetJMethod(env, clazz, "exitFullscreenVideo", "()V"); #endif m_javaGlue->m_setWebTextViewAutoFillable = GetJMethod(env, clazz, "setWebTextViewAutoFillable", "(ILjava/lang/String;)V"); @@ -4097,16 +4095,10 @@ void WebViewCore::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode } #if ENABLE(VIDEO) -void WebViewCore::enterFullscreenForVideoLayer(int layerId, const WTF::String& url) +void WebViewCore::enterFullscreenForVideoLayer() { - JNIEnv* env = JSC::Bindings::getJNIEnv(); - AutoJObject javaObject = m_javaGlue->object(env); - if (!javaObject.get()) - return; - jstring jUrlStr = wtfStringToJstring(env, url); - env->CallVoidMethod(javaObject.get(), m_javaGlue->m_enterFullscreenForVideoLayer, layerId, jUrlStr); + // Just need to update the video mode, to avoid multiple exit full screen. m_fullscreenVideoMode = true; - checkException(env); } void WebViewCore::exitFullscreenVideo() |