am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.

Merge commit 'aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp

* commit 'aad6f24e036b3740071bb995b955b18b572067b2':
  Merge webkit.org at r51976 : Fix general conflicts.

2 files changed, 5 insertions, 29 deletions

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 87d2d6c..b338017 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -974,23 +974,14 @@ void FrameView::repaintContentRectangle(const IntRect& r, bool immediate)
 
     double delay = adjustedDeferredRepaintDelay();
     if ((m_deferringRepaints || m_deferredRepaintTimer.isActive() || delay) && !immediate) {
-<<<<<<< HEAD:WebCore/page/FrameView.cpp
-        IntRect visibleContent = visibleContentRect();
-#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS
-        IntRect fullVis = visibleContent;
-#endif
-        visibleContent.intersect(r);
-#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS
-        if (r != visibleContent)
-            ScrollView::platformOffscreenContentRectangle(fullVis, r);
-#endif
-        if (visibleContent.isEmpty())
-=======
         IntRect paintRect = r;
         if (!paintsEntireContents())
             paintRect.intersect(visibleContentRect());
+#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS
+        if (r != paintRect)
+            ScrollView::platformOffscreenContentRectangle(visibleContentRect(), r);
+#endif
         if (paintRect.isEmpty())
->>>>>>> webkit.org at r51976:WebCore/page/FrameView.cpp
             return;
         if (m_repaintCount == cRepaintRectUnionThreshold) {
             IntRect unionedRect;
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 561d19c..b94947e 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -87,13 +87,8 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*)
 {
     m_timer.stop();
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
-    // Cache our pointer to the Geolocation object, as this object could be
-    // deleted by a call to clearWatch in a callback.
-=======
     // Cache our pointer to the Geolocation object, as this GeoNotifier object
     // could be deleted by a call to clearWatch in a callback.
->>>>>>> webkit.org at r51976:WebCore/page/Geolocation.cpp
     Geolocation* geolocation = m_geolocation;
 
     if (m_fatalError) {
@@ -101,15 +96,12 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*)
             m_errorCallback->handleEvent(m_fatalError.get());
         // This will cause this notifier to be deleted.
         geolocation->fatalErrorOccurred(this);
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
         return;
     }
 
     if (m_cachedPosition) {
         m_successCallback->handleEvent(m_cachedPosition.get());
         geolocation->requestReturnedCachedPosition(this);
-=======
->>>>>>> webkit.org at r51976:WebCore/page/Geolocation.cpp
         return;
     }
 
@@ -370,7 +362,6 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi
     if (isDenied())
         notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
     else {
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
         if (haveSuitableCachedPosition(notifier->m_options.get())) {
             ASSERT(m_cachedPositionManager->cachedPosition());
             if (isAllowed())
@@ -383,14 +374,8 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi
             if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get()))
                 notifier->startTimerIfNeeded();
             else
-                notifier->setFatalError(PositionError::create(PositionError::UNKNOWN_ERROR, "Failed to start Geolocation service"));
+                notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, "Failed to start Geolocation service"));
         }
-=======
-        if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get()))
-            notifier->startTimerIfNeeded();
-        else
-            notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, "Failed to start Geolocation service"));
->>>>>>> webkit.org at r51976:WebCore/page/Geolocation.cpp
     }
 
     return notifier.release();