3 files changed, 5 insertions, 29 deletions
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index 6df462a..19a1dca 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
@@ -718,23 +717,14 @@ void ScrollView::frameRectsChanged()
 
 void ScrollView::repaintContentRectangle(const IntRect& rect, bool now)
 {
-<<<<<<< HEAD:WebCore/platform/ScrollView.cpp
-    IntRect visibleContent = visibleContentRect();
-#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS
-    IntRect fullVis = visibleContent;
-#endif
-    visibleContent.intersect(rect);
-#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS
-    if (rect != visibleContent)
-        platformOffscreenContentRectangle(fullVis, rect);
-#endif
-    if (visibleContent.isEmpty())
-=======
     IntRect paintRect = rect;
     if (!paintsEntireContents())
         paintRect.intersect(visibleContentRect());
+#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS
+    if (rect != paintRect)
+        platformOffscreenContentRectangle(visibleContentRect(), rect);
+#endif
     if (paintRect.isEmpty())
->>>>>>> webkit.org at r51976:WebCore/platform/ScrollView.cpp
         return;
     if (platformWidget()) {
         platformRepaintContentRectangle(paintRect, now);
@@ -1065,12 +1055,8 @@ bool ScrollView::platformScroll(ScrollDirection, ScrollGranularity)
     return true;
 }
 
-<<<<<<< HEAD:WebCore/platform/ScrollView.cpp
 #if !PLATFORM(ANDROID)
-void ScrollView::platformRepaintContentRectangle(const IntRect&, bool now)
-=======
 void ScrollView::platformRepaintContentRectangle(const IntRect&, bool /*now*/)
->>>>>>> webkit.org at r51976:WebCore/platform/ScrollView.cpp
 {
 }
 
diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp
index 2213a11..6196548 100644
--- a/WebCore/platform/Widget.cpp
+++ b/WebCore/platform/Widget.cpp
@@ -127,11 +127,7 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint
 }
 #endif
 
-<<<<<<< HEAD:WebCore/platform/Widget.cpp
-#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID)
-=======
-#if (!PLATFORM(MAC) && !PLATFORM(GTK)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
->>>>>>> webkit.org at r51976:WebCore/platform/Widget.cpp
+#if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
 void Widget::releasePlatformWidget()
 {
 }
diff --git a/WebCore/platform/network/ResourceHandleInternal.h b/WebCore/platform/network/ResourceHandleInternal.h
index 8313560..f7135ee 100644
--- a/WebCore/platform/network/ResourceHandleInternal.h
+++ b/WebCore/platform/network/ResourceHandleInternal.h
@@ -218,15 +218,9 @@ namespace WebCore {
         // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.
         NSURLAuthenticationChallenge *m_currentMacChallenge;
 #endif
-<<<<<<< HEAD:WebCore/platform/network/ResourceHandleInternal.h
-#if USE(CFNETWORK)
-        CFURLAuthChallengeRef m_currentCFChallenge;
-#endif
 #if PLATFORM(ANDROID)
         RefPtr<ResourceLoaderAndroid> m_loader;
 #endif
-=======
->>>>>>> webkit.org at r51976:WebCore/platform/network/ResourceHandleInternal.h
         AuthenticationChallenge m_currentWebChallenge;
 
         ResourceHandle::FailureType m_failureType;