diff options
| author | George Mount <mount@google.com> | 2011-12-05 15:55:24 -0800 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2011-12-05 16:56:08 -0800 |
| commit | beeb8cbb217cca6094affa12a630bd75938909c9 (patch) | |
| tree | d63d4b22db9add0276361994e1933617b1448c0c /Source/WebKit/android/nav/WebView.cpp | |
| parent | b3266cb41eee1fc7da88e5e091bab29ae25685e7 (diff) | |
| download | external_webkit-beeb8cbb217cca6094affa12a630bd75938909c9.zip external_webkit-beeb8cbb217cca6094affa12a630bd75938909c9.tar.gz external_webkit-beeb8cbb217cca6094affa12a630bd75938909c9.tar.bz2 | |
Remove inFullScreenMode JNI call during drawGL call.
Bug 5629367
Corresonding Framework change: Icc2fb6b7
Change-Id: Ia6f116362107243f472401a1d6361a72e88832a5
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 870d0d6..ad6fc8c 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -131,7 +131,6 @@ struct JavaGlue { jmethodID m_viewInvalidateRect; jmethodID m_postInvalidateDelayed; jmethodID m_pageSwapCallback; - jmethodID m_inFullScreenMode; jfieldID m_rectLeft; jfieldID m_rectTop; jmethodID m_rectWidth; @@ -170,7 +169,6 @@ WebView(JNIEnv* env, jobject javaWebView, int viewImpl, WTF::String drawableDir, m_javaGlue.m_postInvalidateDelayed = GetJMethod(env, clazz, "viewInvalidateDelayed", "(JIIII)V"); m_javaGlue.m_pageSwapCallback = GetJMethod(env, clazz, "pageSwapCallback", "(Z)V"); - m_javaGlue.m_inFullScreenMode = GetJMethod(env, clazz, "inFullScreenMode", "()Z"); m_javaGlue.m_getTextHandleScale = GetJMethod(env, clazz, "getTextHandleScale", "()F"); env->DeleteLocalRef(clazz); @@ -448,7 +446,7 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, WebCore::IntRect& clip, float scale, int extras) { #if USE(ACCELERATED_COMPOSITING) - if (!m_baseLayer || inFullScreenMode()) + if (!m_baseLayer) return false; if (!m_glWebViewState) { @@ -1400,17 +1398,6 @@ void postInvalidateDelayed(int64_t delay, const WebCore::IntRect& bounds) checkException(env); } -bool inFullScreenMode() -{ - JNIEnv* env = JSC::Bindings::getJNIEnv(); - AutoJObject javaObject = m_javaGlue.object(env); - if (!javaObject.get()) - return false; - jboolean result = env->CallBooleanMethod(javaObject.get(), m_javaGlue.m_inFullScreenMode); - checkException(env); - return result; -} - int moveGeneration() { return m_viewImpl->m_moveGeneration; @@ -1565,8 +1552,7 @@ class GLDrawFunctor : Functor { public: GLDrawFunctor(WebView* _wvInstance, bool(WebView::*_funcPtr)(WebCore::IntRect&, WebCore::IntRect*, - WebCore::IntRect&, int, WebCore::IntRect&, - jfloat, jint), + WebCore::IntRect&, int, WebCore::IntRect&, jfloat, jint), WebCore::IntRect _viewRect, float _scale, int _extras) { wvInstance = _wvInstance; funcPtr = _funcPtr; |