diff options
| author | John Reck <jreck@google.com> | 2012-07-24 20:16:08 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-07-27 13:15:00 -0700 |
| commit | 77d974918eff4b56050e9f1c3a78becab1244a04 (patch) | |
| tree | ef5b80aabc262486b83f66830a9726a5a01e8aaa /Source/WebKit | |
| parent | 2bbb442aa27ea29ef6337eba9021ea509400cb84 (diff) | |
| download | external_webkit-77d974918eff4b56050e9f1c3a78becab1244a04.zip external_webkit-77d974918eff4b56050e9f1c3a78becab1244a04.tar.gz external_webkit-77d974918eff4b56050e9f1c3a78becab1244a04.tar.bz2 | |
DO NOT MERGE Push everything into an R-Tree
Cherry pick from master
Change-Id: I0ef32777f33104d440459d9d4d3c0d61f75a11a2
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/PicturePile.cpp | 1 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/PicturePile.cpp b/Source/WebKit/android/jni/PicturePile.cpp index 554bd1b..0731977 100644 --- a/Source/WebKit/android/jni/PicturePile.cpp +++ b/Source/WebKit/android/jni/PicturePile.cpp @@ -40,7 +40,6 @@ #include "SkRegion.h" #if USE_RECORDING_CONTEXT -#include "GraphicsOperationCollection.h" #include "PlatformGraphicsContextRecording.h" #else #include "SkPicture.h" diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index ec027cd..79019cb 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -63,7 +63,6 @@ #include "Geolocation.h" #include "GraphicsContext.h" #include "GraphicsJNI.h" -#include "GraphicsOperationCollection.h" #include "HTMLAnchorElement.h" #include "HTMLAreaElement.h" #include "HTMLElement.h" |