summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/nav
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-21 16:41:25 -0700
committerJohn Reck <jreck@google.com>2012-05-21 16:41:25 -0700
commit72263f1fff55cb108fa98f4b06ae9447d8114757 (patch)
tree293a888c33587b5edbea6a49ec4697ba503f3c1d /Source/WebKit/android/nav
parent2c52cc3176d97bc3f0bb59f8684c06c94201ef98 (diff)
downloadexternal_webkit-72263f1fff55cb108fa98f4b06ae9447d8114757.zip
external_webkit-72263f1fff55cb108fa98f4b06ae9447d8114757.tar.gz
external_webkit-72263f1fff55cb108fa98f4b06ae9447d8114757.tar.bz2
Null check
Bug: 6525224 Change-Id: Id47ebe8a99388765340f7628b6398644dd7d852c
Diffstat (limited to 'Source/WebKit/android/nav')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 7485e83..a1d7fda 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1124,9 +1124,10 @@ static bool nativeScrollLayer(JNIEnv* env, jobject obj,
static void nativeSetIsScrolling(JNIEnv* env, jobject jwebview, jboolean isScrolling)
{
+ // TODO: Pass in the native pointer instead
WebView* view = GET_NATIVE_VIEW(env, jwebview);
- ALOG_ASSERT(view, "view not set in %s", __FUNCTION__);
- view->setIsScrolling(isScrolling);
+ if (view)
+ view->setIsScrolling(isScrolling);
}
static void nativeUseHardwareAccelSkia(JNIEnv*, jobject, jboolean enabled)