diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-03-12 09:58:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-12 09:58:42 -0700 |
| commit | ff1fac5a46092b3224b789b10a0989d50f0f1746 (patch) | |
| tree | 2ff7f7b997281a6485df752b06bc62615741eaa0 /Source/WebKit | |
| parent | b181d71892f361d947d333599f536bb5c5d1efa8 (diff) | |
| parent | 1969832edc74f5a34c300f386e6739d5faff6bed (diff) | |
| download | external_webkit-ff1fac5a46092b3224b789b10a0989d50f0f1746.zip external_webkit-ff1fac5a46092b3224b789b10a0989d50f0f1746.tar.gz external_webkit-ff1fac5a46092b3224b789b10a0989d50f0f1746.tar.bz2 | |
am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge."
* commit '1969832edc74f5a34c300f386e6739d5faff6bed':
Update WebKit with necessary changes for the Skia merge.
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.h | 1 |
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; |