diff options
| author | John Reck <jreck@google.com> | 2015-04-17 20:45:35 +0000 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-04-17 20:45:35 +0000 |
| commit | c2aae77521ed9db7157053968fe1070b8cac2d6a (patch) | |
| tree | 47e9d2ddc6259acafec6ada13f2b3b73eaba6e4b /chromium | |
| parent | 260be08b742bf725cf92239c50f47a8c07280130 (diff) | |
| download | webview-c2aae77521ed9db7157053968fe1070b8cac2d6a.tar.gz | |
Revert "GraphicsJNI update"
This reverts commit 260be08b742bf725cf92239c50f47a8c07280130.
Change-Id: I4a50e890a63d22ff517ae1bd53f00bf05d8553ff
Diffstat (limited to 'chromium')
| -rw-r--r-- | chromium/Android.mk | 2 | ||||
| -rw-r--r-- | chromium/plat_support/graphics_utils.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/chromium/Android.mk b/chromium/Android.mk index e015510..c0facb2 100644 --- a/chromium/Android.mk +++ b/chromium/Android.mk @@ -34,7 +34,6 @@ 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 += \ @@ -44,7 +43,6 @@ 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 1e88c12..c2017d3 100644 --- a/chromium/plat_support/graphics_utils.cpp +++ b/chromium/plat_support/graphics_utils.cpp @@ -55,11 +55,7 @@ PixelInfo::~PixelInfo() { } AwPixelInfo* GetPixels(JNIEnv* env, jobject java_canvas) { - android::Canvas* nativeCanvas = GraphicsJNI::getNativeCanvas(env, java_canvas); - if (!nativeCanvas) - return NULL; - - SkCanvas* canvas = nativeCanvas->asSkCanvas(); + SkCanvas* canvas = GraphicsJNI::getNativeCanvas(env, java_canvas); if (!canvas) return NULL; |