diff options
| author | John Reck <jreck@google.com> | 2015-04-22 20:00:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 20:00:44 +0000 |
| commit | 01223cc646651c96b8493853ac78b54158cbf5ec (patch) | |
| tree | 430399180706ae64a25567a0b2a7e77dcaaea1ab /chromium | |
| parent | 4ceb92495a0a693b4cdd274e7b1160e07c49a133 (diff) | |
| parent | 165a43df7df4aa5121697893c31b9571492939bc (diff) | |
| download | webview-01223cc646651c96b8493853ac78b54158cbf5ec.tar.gz | |
Merge "Revert "Revert "GraphicsJNI update"""
Diffstat (limited to 'chromium')
| -rw-r--r-- | chromium/Android.mk | 2 | ||||
| -rw-r--r-- | chromium/plat_support/graphics_utils.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chromium/Android.mk b/chromium/Android.mk index c0facb2..e015510 100644 --- a/chromium/Android.mk +++ b/chromium/Android.mk @@ -34,6 +34,7 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ external/skia/include/core \ frameworks/base/core/jni/android/graphics \ + frameworks/base/libs/hwui \ frameworks/native/include/ui \ LOCAL_SHARED_LIBRARIES += \ @@ -43,6 +44,7 @@ LOCAL_SHARED_LIBRARIES += \ libskia \ libui \ libutils \ + libhwui \ LOCAL_MODULE_TAGS := optional diff --git a/chromium/plat_support/graphics_utils.cpp b/chromium/plat_support/graphics_utils.cpp index c2017d3..1e88c12 100644 --- a/chromium/plat_support/graphics_utils.cpp +++ b/chromium/plat_support/graphics_utils.cpp @@ -55,7 +55,11 @@ PixelInfo::~PixelInfo() { } AwPixelInfo* GetPixels(JNIEnv* env, jobject java_canvas) { - SkCanvas* canvas = GraphicsJNI::getNativeCanvas(env, java_canvas); + android::Canvas* nativeCanvas = GraphicsJNI::getNativeCanvas(env, java_canvas); + if (!nativeCanvas) + return NULL; + + SkCanvas* canvas = nativeCanvas->asSkCanvas(); if (!canvas) return NULL; |