6 files changed, 7 insertions, 46 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 8bf0d86..95eb67f 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1060,15 +1060,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #endif
 #endif
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID) && !defined WTF_USE_ACCELERATED_COMPOSITING
 #define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif
 
-#if PLATFORM(IPHONE)
-=======
 #if PLATFORM(IOS)
->>>>>>> webkit.org at r65072
 #define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif
 
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index f0245ec..8c759cb 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -67,13 +67,10 @@
 #include "StepRange.h"
 #include "StringHash.h"
 #include "TextEvent.h"
-<<<<<<< HEAD
 #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
 #include "WebViewCore.h"
 #endif
-=======
 #include "WheelEvent.h"
->>>>>>> webkit.org at r65072
 #include <wtf/HashMap.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
diff --git a/WebCore/page/Navigator.h b/WebCore/page/Navigator.h
index de10d62..e0801fe 100644
--- a/WebCore/page/Navigator.h
+++ b/WebCore/page/Navigator.h
@@ -21,15 +21,15 @@
 #define Navigator_h
 
 #include "NavigatorBase.h"
-<<<<<<< HEAD
-#include "PlatformString.h"
-=======
 #include <wtf/Forward.h>
->>>>>>> webkit.org at r65072
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+#include "PlatformString.h"
+#endif
+
 namespace WebCore {
 
 class DOMMimeTypeArray;
@@ -37,14 +37,10 @@ class DOMPluginArray;
 class Frame;
 class Geolocation;
 class PluginData;
-<<<<<<< HEAD
-class String;
 #if PLATFORM(ANDROID)
 class ApplicationInstalledCallback;
 class Connection;
 #endif
-=======
->>>>>>> webkit.org at r65072
 
 class Navigator : public NavigatorBase, public RefCounted<Navigator> {
 public:
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 2cacef9..bedb91b 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -311,17 +311,7 @@ void* WebCore::Frame::dragImageForSelection()
     return 0;
 }
 
-<<<<<<< HEAD
-void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WebCore::String const&) {}
-=======
-
-WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&)
-{
-    return WTF::String();
-}
-
 void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {}
->>>>>>> webkit.org at r65072
 
 namespace WebCore {
 
diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index aafbce6..9cae2f1 100644
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -69,7 +69,6 @@ class wxWindowDC;
     typedef wxWindowDC PlatformGraphicsContext;
 #endif
 #elif PLATFORM(SKIA)
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
 namespace WebCore {
 class PlatformGraphicsContext;
@@ -77,14 +76,11 @@ class PlatformGraphicsContext;
 class SkPaint;
 struct SkPoint;
 #else
-typedef class PlatformContextSkia PlatformGraphicsContext;
-#endif
-=======
 namespace WebCore {
 class PlatformContextSkia;
 }
 typedef WebCore::PlatformContextSkia PlatformGraphicsContext;
->>>>>>> webkit.org at r65072
+#endif
 #elif PLATFORM(HAIKU)
 class BView;
 typedef BView PlatformGraphicsContext;
diff --git a/WebCore/platform/graphics/ImageSource.h b/WebCore/platform/graphics/ImageSource.h
index 3226b41..014c136 100644
--- a/WebCore/platform/graphics/ImageSource.h
+++ b/WebCore/platform/graphics/ImageSource.h
@@ -47,19 +47,15 @@ QT_END_NAMESPACE
 struct _cairo_surface;
 typedef struct _cairo_surface cairo_surface_t;
 #elif PLATFORM(SKIA)
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
 #include "SkString.h"
 class SkBitmapRef;
 class PrivateAndroidImageSourceRec;
 #else
-class NativeImageSkia;
-#endif
-=======
 namespace WebCore {
 class NativeImageSkia;
 }
->>>>>>> webkit.org at r65072
+#endif
 #elif PLATFORM(HAIKU)
 class BBitmap;
 #elif OS(WINCE)
@@ -84,9 +80,7 @@ typedef TiledImageOpenVG* NativeImagePtr;
 class ImageDecoderQt;
 typedef ImageDecoderQt* NativeImageSourcePtr;
 typedef QPixmap* NativeImagePtr;
-#elif PLATFORM(SKIA)
-#if PLATFORM(ANDROID)
-class String;
+#elif PLATFORM(SKIA) && PLATFORM(ANDROID)
 #ifdef ANDROID_ANIMATED_GIF
 class ImageDecoder;
 #endif
@@ -102,11 +96,6 @@ typedef SkBitmapRef* NativeImagePtr;
 #else
 class ImageDecoder;
 typedef ImageDecoder* NativeImageSourcePtr;
-typedef NativeImageSkia* NativeImagePtr;
-#endif
-#else
-class ImageDecoder;
-typedef ImageDecoder* NativeImageSourcePtr;
 #if PLATFORM(WX)
 #if USE(WXGC)
 typedef wxGraphicsBitmap* NativeImagePtr;
@@ -115,11 +104,8 @@ typedef wxBitmap* NativeImagePtr;
 #endif
 #elif PLATFORM(CAIRO)
 typedef cairo_surface_t* NativeImagePtr;
-<<<<<<< HEAD
-=======
 #elif PLATFORM(SKIA)
 typedef WebCore::NativeImageSkia* NativeImagePtr;
->>>>>>> webkit.org at r65072
 #elif PLATFORM(HAIKU)
 typedef BBitmap* NativeImagePtr;
 #elif OS(WINCE)