commit 1d825a24ae1071c3e8eea247f06329f89b7248bf
author Derek Sollenberger <djsollen@google.com> Mon Feb 04 15:40:51 2013 -0500
committer Derek Sollenberger <djsollen@google.com> Mon Feb 04 15:40:51 2013 -0500
tree b5e456e6bceeff5007bb600afb0a86f6d1aef34f
parent 94bcd9e3661813605b05f5f19601bb6b665476bb

Changes needed to roll Skia to r7527.

Change-Id: Icf9f0a42d8c84385a70b15a72d2d040eb96d942a

Android.mk

diff --git a/Android.mk b/Android.mk
index 6b46111..f55d5a1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,6 +88,7 @@
 	external/skia/include/ports \
 	external/skia/include/utils \
 	external/skia/src/core \
+	external/skia/src/images \
 	external/skia/src/ports \
 	external/sqlite/dist \
 	frameworks/base/core/jni/android/graphics \

Source/WebKit/android/nav/WebView.cpp

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 66dbdc1..66eccb8 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1180,7 +1180,7 @@
 
 static void nativeDumpDisplayTree(JNIEnv* env, jobject jwebview, jstring jurl)
 {
-#ifdef ANDROID_DUMP_DISPLAY_TREE
+#if defined(ANDROID_DUMP_DISPLAY_TREE) && defined(SK_DEVELOPER)
     WebView* view = GET_NATIVE_VIEW(env, jwebview);
     ALOG_ASSERT(view, "view not set in %s", __FUNCTION__);