summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2012-03-12 05:13:16 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-03-12 05:13:18 -0700
commit1969832edc74f5a34c300f386e6739d5faff6bed (patch)
tree73d2a410075c6fcc50e43ee8259042c5ef73a594 /Source/WebKit/android
parentf2296bfba333e80ebd11a63883d391b38f1ddb84 (diff)
parent7f85821c0d01e4208814685f4d86faccb27816b1 (diff)
downloadexternal_webkit-1969832edc74f5a34c300f386e6739d5faff6bed.zip
external_webkit-1969832edc74f5a34c300f386e6739d5faff6bed.tar.gz
external_webkit-1969832edc74f5a34c300f386e6739d5faff6bed.tar.bz2
Merge "Update WebKit with necessary changes for the Skia merge."
Diffstat (limited to 'Source/WebKit/android')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index a05c3ea..a19a5b2 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -45,6 +45,7 @@
#include <jni.h>
#include <ui/KeycodeLabels.h>
#include <ui/PixelFormat.h>
+#include <utils/threads.h>
namespace WebCore {
class Color;