diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:39:30 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 22:46:51 +0000 |
| commit | 77dd3843724f8ca0ae8084012c79af6ffbaef528 (patch) | |
| tree | 6c72f0ce4d96990cf97f4ed2e3f5221279d8f0cb /WebKit/android/WebCoreSupport | |
| parent | be8eaaca0526f55f497212ffc609a5155de3dd0e (diff) | |
| download | external_webkit-77dd3843724f8ca0ae8084012c79af6ffbaef528.zip external_webkit-77dd3843724f8ca0ae8084012c79af6ffbaef528.tar.gz external_webkit-77dd3843724f8ca0ae8084012c79af6ffbaef528.tar.bz2 | |
Merge webkit.org at r54127 : Fix some WebKit includes
Change-Id: Ibcdef84d6e49c7e4a725ac1d22ae59a165418280
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 19 |
1 files changed, 10 insertions, 9 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> |