diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 17:40:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 12:10:53 +0100 |
| commit | 92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9 (patch) | |
| tree | 9fc2c5312ac733f5b86a6d4d8373c8715db5e3bf /WebCore/page | |
| parent | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (diff) | |
| download | external_webkit-92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9.zip external_webkit-92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9.tar.gz external_webkit-92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9.tar.bz2 | |
Merge WebKit at r59636: Fix conflicts
Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/Frame.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp index 1261d08..f971b96 100644 --- a/WebCore/page/Frame.cpp +++ b/WebCore/page/Frame.cpp @@ -105,21 +105,6 @@ #include "XLinkNames.h" #endif -<<<<<<< HEAD -#if PLATFORM(ANDROID) -#include "WebViewCore.h" -#endif - -#if ENABLE(WML) -#include "WMLNames.h" -#endif - -#if ENABLE(MATHML) -#include "MathMLNames.h" -#endif - -======= ->>>>>>> webkit.org at r59636 #if ENABLE(TILED_BACKING_STORE) #include "TiledBackingStore.h" #endif @@ -128,6 +113,10 @@ #include "WMLNames.h" #endif +#if PLATFORM(ANDROID) +#include "WebViewCore.h" +#endif + using namespace std; namespace WebCore { |