diff options
author | Chris Craik <ccraik@google.com> | 2012-05-08 13:43:48 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2012-05-08 14:27:20 -0700 |
commit | 0c98d349b66fb7649824d019023aa64b4a2e80f7 (patch) | |
tree | a0e51a3e0a637e57f9572a0f4e1e45cc45516858 /Source/WebKit/android | |
parent | e19b4847176a5d05309947d1f57f57e5d63c7e61 (diff) | |
download | external_webkit-0c98d349b66fb7649824d019023aa64b4a2e80f7.zip external_webkit-0c98d349b66fb7649824d019023aa64b4a2e80f7.tar.gz external_webkit-0c98d349b66fb7649824d019023aa64b4a2e80f7.tar.bz2 |
Pass webview instance when getting base layer / color, and prevent null value
depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/188470/
bug:6429897
Change-Id: I374534b0302b5029d69b058c670083e6ad33ea95
Diffstat (limited to 'Source/WebKit/android')
-rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 749c4aa..3822239 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -804,7 +804,7 @@ static jint nativeCreateDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView jobject jvisiblecontentrect, jfloat scale, jint extras) { WebCore::IntRect invScreenRect = jrect_to_webrect(env, jinvscreenrect); - WebView *wvInstance = (WebView*) nativeView; + WebView *wvInstance = reinterpret_cast<WebView*>(nativeView); SkRect visibleContentRect = jrectf_to_rect(env, jvisiblecontentrect); wvInstance->setVisibleContentRect(visibleContentRect); @@ -826,7 +826,7 @@ static jint nativeCreateDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView } static jint nativeGetDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView) { - WebView *wvInstance = (WebView*) nativeView; + WebView *wvInstance = reinterpret_cast<WebView*>(nativeView); if (!wvInstance) return 0; @@ -836,7 +836,7 @@ static jint nativeGetDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView) { static void nativeUpdateDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView, jobject jinvscreenrect, jobject jscreenrect, jobject jvisiblecontentrect, jfloat scale) { - WebView *wvInstance = (WebView*) nativeView; + WebView *wvInstance = reinterpret_cast<WebView*>(nativeView); if (wvInstance) { GLDrawFunctor* functor = (GLDrawFunctor*) wvInstance->getFunctor(); if (functor) { @@ -858,7 +858,7 @@ static bool nativeEvaluateLayersAnimations(JNIEnv *env, jobject obj, jint native { // only call in software rendering, initialize and evaluate animations #if USE(ACCELERATED_COMPOSITING) - BaseLayerAndroid* baseLayer = ((WebView*)nativeView)->getBaseLayer(); + BaseLayerAndroid* baseLayer = reinterpret_cast<WebView*>(nativeView)->getBaseLayer(); if (baseLayer) { baseLayer->initAnimations(); return baseLayer->evaluateAnimations(); @@ -872,13 +872,13 @@ static bool nativeSetBaseLayer(JNIEnv *env, jobject obj, jint nativeView, jint l jboolean isPictureAfterFirstLayout) { BaseLayerAndroid* layerImpl = reinterpret_cast<BaseLayerAndroid*>(layer); - return ((WebView*)nativeView)->setBaseLayer(layerImpl, showVisualIndicator, - isPictureAfterFirstLayout); + return reinterpret_cast<WebView*>(nativeView)->setBaseLayer(layerImpl, showVisualIndicator, + isPictureAfterFirstLayout); } -static BaseLayerAndroid* nativeGetBaseLayer(JNIEnv *env, jobject obj) +static BaseLayerAndroid* nativeGetBaseLayer(JNIEnv *env, jobject obj, jint nativeView) { - return GET_NATIVE_VIEW(env, obj)->getBaseLayer(); + return reinterpret_cast<WebView*>(nativeView)->getBaseLayer(); } static void nativeCopyBaseContentToPicture(JNIEnv *env, jobject obj, jobject pict) @@ -1151,9 +1151,9 @@ static void nativeUseHardwareAccelSkia(JNIEnv*, jobject, jboolean enabled) BaseRenderer::setCurrentRendererType(enabled ? BaseRenderer::Ganesh : BaseRenderer::Raster); } -static int nativeGetBackgroundColor(JNIEnv* env, jobject obj) +static int nativeGetBackgroundColor(JNIEnv* env, jobject obj, jint nativeView) { - WebView* view = GET_NATIVE_VIEW(env, obj); + WebView* view = reinterpret_cast<WebView*>(nativeView); BaseLayerAndroid* baseLayer = view->getBaseLayer(); if (baseLayer) { WebCore::Color color = baseLayer->getBackgroundColor(); @@ -1167,7 +1167,7 @@ static int nativeGetBackgroundColor(JNIEnv* env, jobject obj) static void nativeSetPauseDrawing(JNIEnv *env, jobject obj, jint nativeView, jboolean pause) { - ((WebView*)nativeView)->m_isDrawingPaused = pause; + reinterpret_cast<WebView*>(nativeView)->m_isDrawingPaused = pause; } static void nativeSetTextSelection(JNIEnv *env, jobject obj, jint nativeView, @@ -1246,7 +1246,7 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeSetHeightCanMeasure }, { "nativeSetBaseLayer", "(IIZZ)Z", (void*) nativeSetBaseLayer }, - { "nativeGetBaseLayer", "()I", + { "nativeGetBaseLayer", "(I)I", (void*) nativeGetBaseLayer }, { "nativeCopyBaseContentToPicture", "(Landroid/graphics/Picture;)V", (void*) nativeCopyBaseContentToPicture }, @@ -1278,7 +1278,7 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeSetIsScrolling }, { "nativeUseHardwareAccelSkia", "(Z)V", (void*) nativeUseHardwareAccelSkia }, - { "nativeGetBackgroundColor", "()I", + { "nativeGetBackgroundColor", "(I)I", (void*) nativeGetBackgroundColor }, { "nativeSetProperty", "(Ljava/lang/String;Ljava/lang/String;)Z", (void*) nativeSetProperty }, |