8 files changed, 13 insertions, 36 deletions
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index a8473be..adaea81 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -243,8 +243,7 @@ V8Proxy::~V8Proxy()
     windowShell()->destroyGlobal();
 }
 
-<<<<<<< HEAD
-v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine)
+v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData)
 #ifdef ANDROID_INSTRUMENT
 {
     android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter);
@@ -253,11 +252,8 @@ v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const
     return script;
 }
 
-v8::Handle<v8::Script> V8Proxy::compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine)
+v8::Handle<v8::Script> V8Proxy::compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData)
 #endif
-=======
-v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData)
->>>>>>> webkit.org at r61871
 {
     const uint16_t* fileNameString = fromWebCoreString(fileName);
     v8::Handle<v8::String> name = v8::String::New(fileNameString, fileName.length());
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h
index f0e1768..7e590ff 100644
--- a/WebCore/bridge/npapi.h
+++ b/WebCore/bridge/npapi.h
@@ -381,7 +381,6 @@ typedef enum {
   , NPPVpluginCoreAnimationLayer = 1003
 #endif
 
-<<<<<<< HEAD
 #ifdef ANDROID
     /* Used when the plugin returns 0 from NPN_WriteReady and wishes the browser
      * to wait a certain amount of millis before calling NPN_WriteReady again.
@@ -390,10 +389,10 @@ typedef enum {
 
     // TODO(reed): upstream
     , NPPFakeValueToForce32Bits = 0x7FFFFFFF
-=======
+#endif
+
 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
   , NPPVpluginWindowlessLocalBool = 2002
->>>>>>> webkit.org at r61871
 #endif
 } NPPVariable;
 
@@ -438,14 +437,13 @@ typedef enum {
 #endif
   , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
 #endif /* XP_MACOSX */
-<<<<<<< HEAD
     
 #ifdef ANDROID
     , NPNFakeValueToForce32Bits = 0x7FFFFFFF
-=======
+#endif
+
 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
   , NPNVSupportsWindowlessLocal = 2002
->>>>>>> webkit.org at r61871
 #endif
 } NPNVariable;
 
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index c9a2182..99ec33e 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -431,13 +431,10 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
 
     m_frame = frame;
 
-<<<<<<< HEAD
-#if !PLATFORM(ANDROID)
-=======
     if (frame || !url.isEmpty())
         setURL(url);
 
->>>>>>> webkit.org at r61871
+#if !PLATFORM(ANDROID)
     m_axObjectCache = 0;
 #endif
     
diff --git a/WebCore/dom/XMLDocumentParser.h b/WebCore/dom/XMLDocumentParser.h
index 9915409..7553cea 100644
--- a/WebCore/dom/XMLDocumentParser.h
+++ b/WebCore/dom/XMLDocumentParser.h
@@ -319,10 +319,6 @@ bool parseXMLDocumentFragment(const String&, DocumentFragment*, Element* parent
 
 } // namespace WebCore
 
-<<<<<<< HEAD
 #endif // USE(EXPAT)
 
-#endif // XMLTokenizer_h
-=======
 #endif // XMLDocumentParser_h
->>>>>>> webkit.org at r61871
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index b3a1c89..5ac39d9 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -54,11 +54,10 @@ inline HTMLLinkElement::HTMLLinkElement(const QualifiedName& tagName, Document*
     , m_disabledState(Unset)
     , m_loading(false)
     , m_createdByParser(createdByParser)
-<<<<<<< HEAD
-    , m_timer(this, &HTMLLinkElement::timerFired)
-=======
     , m_shouldProcessAfterAttach(false)
->>>>>>> webkit.org at r61871
+#if PLATFORM(ANDROID) && ENABLE(LINK_PREFETCH)
+    , m_timer(this, &HTMLLinkElement::timerFired)
+#endif
 {
     ASSERT(hasTagName(linkTag));
 }
diff --git a/WebCore/html/HTMLLinkElement.h b/WebCore/html/HTMLLinkElement.h
index f19741f..c8f0ca0 100644
--- a/WebCore/html/HTMLLinkElement.h
+++ b/WebCore/html/HTMLLinkElement.h
@@ -163,11 +163,10 @@ private:
     RelAttribute m_relAttribute;
     bool m_loading;
     bool m_createdByParser;
-<<<<<<< HEAD
-    Timer<HTMLLinkElement> m_timer;
-=======
     bool m_shouldProcessAfterAttach;
->>>>>>> webkit.org at r61871
+#if PLATFORM(ANDROID) && ENABLE(LINK_PREFETCH)
+    Timer<HTMLLinkElement> m_timer;
+#endif
 };
 
 } //namespace
diff --git a/WebCore/html/HTMLTableCellElement.cpp b/WebCore/html/HTMLTableCellElement.cpp
index 3fa8946..e102d0b 100644
--- a/WebCore/html/HTMLTableCellElement.cpp
+++ b/WebCore/html/HTMLTableCellElement.cpp
@@ -99,13 +99,9 @@ void HTMLTableCellElement::parseMappedAttribute(Attribute* attr)
         if (renderer() && renderer()->isTableCell())
             toRenderTableCell(renderer())->updateFromElement();
     } else if (attr->name() == nowrapAttr) {
-<<<<<<< HEAD
 #ifdef ANDROID_LAYOUT
         if (!(document()->frame()) || document()->frame()->settings()->layoutAlgorithm() != Settings::kLayoutSSR)
 #endif
-        // FIXME: What about removing the property when the attribute becomes null?
-=======
->>>>>>> webkit.org at r61871
         if (!attr->isNull())
             addCSSProperty(attr, CSSPropertyWhiteSpace, CSSValueWebkitNowrap);
     } else if (attr->name() == widthAttr) {
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
index ba01e6a..81b75b0 100644
--- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
@@ -84,7 +84,6 @@ bool ResourceHandle::supportsBufferedData()
     return false;
 }
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
 // TODO: this needs upstreaming.
 void ResourceHandle::pauseLoad(bool pause)
@@ -94,10 +93,7 @@ void ResourceHandle::pauseLoad(bool pause)
 }
 #endif
 
-void ResourceHandle::setDefersLoading(bool defers)
-=======
 void ResourceHandle::platformSetDefersLoading(bool)
->>>>>>> webkit.org at r61871
 {
     notImplemented();
 }