diff options
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 19 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 51 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 5 |
3 files changed, 35 insertions, 40 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index ae39820..761490a 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -26,20 +26,23 @@ #define LOG_TAG "WebCore" #include "config.h" +#include "FrameLoaderClientAndroid.h" -#include "android_graphics.h" +#include "BackForwardList.h" #include "CString.h" #include "CachedFrame.h" #include "CachedFramePlatformDataAndroid.h" -#include "DocumentLoader.h" #include "DOMImplementation.h" +#include "Document.h" +#include "DocumentLoader.h" #include "Frame.h" #include "FrameLoader.h" -#include "FrameLoaderClientAndroid.h" #include "FrameTree.h" +#include "FrameView.h" #include "GraphicsContext.h" #include "HTMLFrameOwnerElement.h" #include "HTMLPlugInElement.h" +#include "HistoryItem.h" #include "IconDatabase.h" #include "MIMETypeRegistry.h" #include "NotImplemented.h" @@ -52,22 +55,20 @@ #include "ProgressTracker.h" #include "RenderPart.h" #include "ResourceError.h" +#include "ResourceHandle.h" +#include "ResourceHandleInternal.h" #include "SelectionController.h" +#include "Settings.h" #include "SkCanvas.h" #include "SkRect.h" #include "TextEncoding.h" -#include "Document.h" -#include "FrameView.h" -#include "HistoryItem.h" -#include "ResourceHandle.h" -#include "ResourceHandleInternal.h" #include "WebCoreFrameBridge.h" #include "WebCoreResourceLoader.h" #include "WebHistory.h" #include "WebIconDatabase.h" #include "WebFrameView.h" #include "WebViewCore.h" -#include "Settings.h" +#include "android_graphics.h" #include <utils/AssetManager.h> diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 2e1d110..a89e696 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -26,17 +26,16 @@ #define LOG_TAG "webcoreglue" #include "config.h" +#include "WebCoreFrameBridge.h" -#include <wtf/Platform.h> -#include <wtf/CurrentTime.h> - -#include "android_graphics.h" #include "Arena.h" #include "AtomicString.h" +#include "BackForwardList.h" #include "Cache.h" +#include "CString.h" +#include "Chrome.h" #include "ChromeClientAndroid.h" #include "ContextMenuClientAndroid.h" -#include "CString.h" #include "Document.h" #include "DocumentLoader.h" #include "DragClientAndroid.h" @@ -60,17 +59,6 @@ #include "IconDatabase.h" #include "Image.h" #include "InspectorClientAndroid.h" - -#if USE(JSC) -#include "GCController.h" -#include "JSDOMWindow.h" -#include <runtime/JSLock.h> -#elif USE(V8) -#include "JavaNPObjectV8.h" -#include "JavaInstanceV8.h" -#include "V8Counters.h" -#endif // USE(JSC) - #include "KURL.h" #include "Page.h" #include "PageCache.h" @@ -86,32 +74,37 @@ #include "SelectionController.h" #include "Settings.h" #include "SubstituteData.h" -#include "WebCoreFrameBridge.h" #include "WebCoreJni.h" #include "WebCoreResourceLoader.h" #include "WebHistory.h" #include "WebIconDatabase.h" #include "WebFrameView.h" #include "WebViewCore.h" +#include "android_graphics.h" +#include "jni.h" #include "wds/DebugServer.h" -#if USE(JSC) -#include <runtime_root.h> -#include <runtime_object.h> -#endif // USE(JSC) - #include <JNIUtility.h> -#include "jni.h" - -#if USE(JSC) -#include "JavaInstanceJSC.h" -#endif // USE(JSC) - #include <JNIHelp.h> #include <SkGraphics.h> +#include <android_runtime/android_util_AssetManager.h> #include <utils/misc.h> #include <utils/AssetManager.h> -#include <android_runtime/android_util_AssetManager.h> +#include <wtf/CurrentTime.h> +#include <wtf/Platform.h> + +#if USE(JSC) +#include "GCController.h" +#include "JSDOMWindow.h" +#include "JavaInstanceJSC.h" +#include <runtime_object.h> +#include <runtime_root.h> +#include <runtime/JSLock.h> +#elif USE(V8) +#include "JavaNPObjectV8.h" +#include "JavaInstanceV8.h" +#include "V8Counters.h" +#endif // USE(JSC) #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index caf84ce..4385f4d 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -31,6 +31,7 @@ #include "AtomicString.h" #include "CachedNode.h" #include "CachedRoot.h" +#include "Chrome.h" #include "ChromeClientAndroid.h" #include "Color.h" #include "DatabaseTracker.h" @@ -51,7 +52,6 @@ #include "Geolocation.h" #include "GraphicsContext.h" #include "GraphicsJNI.h" -#include "HitTestResult.h" #include "HTMLAnchorElement.h" #include "HTMLAreaElement.h" #include "HTMLElement.h" @@ -64,6 +64,8 @@ #include "HTMLOptionElement.h" #include "HTMLSelectElement.h" #include "HTMLTextAreaElement.h" +#include "HistoryItem.h" +#include "HitTestResult.h" #include "InlineTextBox.h" #include "KeyboardCodes.h" #include "Navigator.h" @@ -99,7 +101,6 @@ #include "TypingCommand.h" #include "WebCoreFrameBridge.h" #include "WebFrameView.h" -#include "HistoryItem.h" #include "android_graphics.h" #include <JNIHelp.h> |