Merge webkit.org at R49305 : Fix merge conflicts.

Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a

8 files changed, 12 insertions, 312 deletions

diff --git a/WebCore/page/Coordinates.h b/WebCore/page/Coordinates.h
index bd29d42..50003ce 100644
--- a/WebCore/page/Coordinates.h
+++ b/WebCore/page/Coordinates.h
@@ -50,11 +50,7 @@ public:
     bool canProvideAltitudeAccuracy() const { return m_canProvideAltitudeAccuracy; }
     bool canProvideHeading() const { return m_canProvideHeading; }
     bool canProvideSpeed() const { return m_canProvideSpeed; }
-<<<<<<< HEAD:WebCore/page/Coordinates.h
-
-=======
     
->>>>>>> webkit.org at 49305:WebCore/page/Coordinates.h
 private:
     Coordinates(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
         : m_latitude(latitude)
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h
index 3e3cbb4..b9b700b 100644
--- a/WebCore/page/DOMWindow.h
+++ b/WebCore/page/DOMWindow.h
@@ -248,110 +248,7 @@ namespace WebCore {
         using EventTarget::dispatchEvent;
         bool dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget);
         void dispatchLoadEvent();
-<<<<<<< HEAD:WebCore/page/DOMWindow.h
-        void dispatchUnloadEvent(RegisteredEventListenerVector* = 0);
-        PassRefPtr<BeforeUnloadEvent> dispatchBeforeUnloadEvent(RegisteredEventListenerVector* = 0);
-=======
->>>>>>> webkit.org at 49305:WebCore/page/DOMWindow.h
-
-<<<<<<< HEAD:WebCore/page/DOMWindow.h
-        // Used for legacy "onEvent" property APIs.
-        void setAttributeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>);
-        void clearAttributeEventListener(const AtomicString& eventType);
-        EventListener* getAttributeEventListener(const AtomicString& eventType) const;
-
-        const RegisteredEventListenerVector& eventListeners() const { return m_eventListeners; }
-        bool hasEventListener(const AtomicString& eventType);
-        void removeAllEventListeners();
-
-        EventListener* onabort() const;
-        void setOnabort(PassRefPtr<EventListener>);
-        EventListener* onblur() const;
-        void setOnblur(PassRefPtr<EventListener>);
-        EventListener* onchange() const;
-        void setOnchange(PassRefPtr<EventListener>);
-        EventListener* onclick() const;
-        void setOnclick(PassRefPtr<EventListener>);
-        EventListener* ondblclick() const;
-        void setOndblclick(PassRefPtr<EventListener>);
-        EventListener* ondrag() const;
-        void setOndrag(PassRefPtr<EventListener>);
-        EventListener* ondragend() const;
-        void setOndragend(PassRefPtr<EventListener>);
-        EventListener* ondragenter() const;
-        void setOndragenter(PassRefPtr<EventListener>);
-        EventListener* ondragleave() const;
-        void setOndragleave(PassRefPtr<EventListener>);
-        EventListener* ondragover() const;
-        void setOndragover(PassRefPtr<EventListener>);
-        EventListener* ondragstart() const;
-        void setOndragstart(PassRefPtr<EventListener>);
-        EventListener* ondrop() const;
-        void setOndrop(PassRefPtr<EventListener>);
-        EventListener* onerror() const;
-        void setOnerror(PassRefPtr<EventListener>);
-        EventListener* onfocus() const;
-        void setOnfocus(PassRefPtr<EventListener>);
-        EventListener* onkeydown() const;
-        void setOnkeydown(PassRefPtr<EventListener>);
-        EventListener* onkeypress() const;
-        void setOnkeypress(PassRefPtr<EventListener>);
-        EventListener* onkeyup() const;
-        void setOnkeyup(PassRefPtr<EventListener>);
-        EventListener* onload() const;
-        void setOnload(PassRefPtr<EventListener>);
-        EventListener* onmousedown() const;
-        void setOnmousedown(PassRefPtr<EventListener>);
-        EventListener* onmousemove() const;
-        void setOnmousemove(PassRefPtr<EventListener>);
-        EventListener* onmouseout() const;
-        void setOnmouseout(PassRefPtr<EventListener>);
-        EventListener* onmouseover() const;
-        void setOnmouseover(PassRefPtr<EventListener>);
-        EventListener* onmouseup() const;
-        void setOnmouseup(PassRefPtr<EventListener>);
-        EventListener* onmousewheel() const;
-        void setOnmousewheel(PassRefPtr<EventListener>);
-        EventListener* onoffline() const;
-        void setOnoffline(PassRefPtr<EventListener>);
-        EventListener* ononline() const;
-        void setOnonline(PassRefPtr<EventListener>);
-        EventListener* onreset() const;
-        void setOnreset(PassRefPtr<EventListener>);
-        EventListener* onresize() const;
-        void setOnresize(PassRefPtr<EventListener>);
-        EventListener* onscroll() const;
-        void setOnscroll(PassRefPtr<EventListener>);
-        EventListener* onsearch() const;
-        void setOnsearch(PassRefPtr<EventListener>);
-        EventListener* onselect() const;
-        void setOnselect(PassRefPtr<EventListener>);
-        EventListener* onstorage() const;
-        void setOnstorage(PassRefPtr<EventListener>);
-        EventListener* onsubmit() const;
-        void setOnsubmit(PassRefPtr<EventListener>);
-        EventListener* onunload() const;
-        void setOnunload(PassRefPtr<EventListener>);
-        EventListener* onbeforeunload() const;
-        void setOnbeforeunload(PassRefPtr<EventListener>);
-        EventListener* onwebkitanimationstart() const;
-        void setOnwebkitanimationstart(PassRefPtr<EventListener>);
-        EventListener* onwebkitanimationiteration() const;
-        void setOnwebkitanimationiteration(PassRefPtr<EventListener>);
-        EventListener* onwebkitanimationend() const;
-        void setOnwebkitanimationend(PassRefPtr<EventListener>);
-        EventListener* onwebkittransitionend() const;
-        void setOnwebkittransitionend(PassRefPtr<EventListener>);
-#if ENABLE(TOUCH_EVENTS) // Android
-        EventListener* ontouchstart() const;
-        void setOntouchstart(PassRefPtr<EventListener>);
-        EventListener* ontouchend() const;
-        void setOntouchend(PassRefPtr<EventListener>);
-        EventListener* ontouchmove() const;
-        void setOntouchmove(PassRefPtr<EventListener>);
-        EventListener* ontouchcancel() const;
-        void setOntouchcancel(PassRefPtr<EventListener>);
-=======
+
         DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
         DEFINE_ATTRIBUTE_EVENT_LISTENER(blur);
         DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
@@ -416,63 +313,23 @@ namespace WebCore {
         DEFINE_ATTRIBUTE_EVENT_LISTENER(invalid);
 #if ENABLE(ORIENTATION_EVENTS)
         DEFINE_ATTRIBUTE_EVENT_LISTENER(orientationchange);
->>>>>>> webkit.org at 49305:WebCore/page/DOMWindow.h
 #endif
-<<<<<<< HEAD:WebCore/page/DOMWindow.h
-        
-        EventListener* oncanplay() const;
-        void setOncanplay(PassRefPtr<EventListener>);
-        EventListener* oncanplaythrough() const;
-        void setOncanplaythrough(PassRefPtr<EventListener>);
-        EventListener* ondurationchange() const;
-        void setOndurationchange(PassRefPtr<EventListener>);
-        EventListener* onemptied() const;
-        void setOnemptied(PassRefPtr<EventListener>);
-        EventListener* onended() const;
-        void setOnended(PassRefPtr<EventListener>);
-        EventListener* onloadeddata() const;
-        void setOnloadeddata(PassRefPtr<EventListener>);
-        EventListener* onloadedmetadata() const;
-        void setOnloadedmetadata(PassRefPtr<EventListener>);
-        EventListener* onpause() const;
-        void setOnpause(PassRefPtr<EventListener>);
-        EventListener* onplay() const;
-        void setOnplay(PassRefPtr<EventListener>);
-        EventListener* onplaying() const;
-        void setOnplaying(PassRefPtr<EventListener>);
-        EventListener* onratechange() const;
-        void setOnratechange(PassRefPtr<EventListener>);
-        EventListener* onseeked() const;
-        void setOnseeked(PassRefPtr<EventListener>);
-        EventListener* onseeking() const;
-        void setOnseeking(PassRefPtr<EventListener>);
-        EventListener* ontimeupdate() const;
-        void setOntimeupdate(PassRefPtr<EventListener>);
-        EventListener* onvolumechange() const;
-        void setOnvolumechange(PassRefPtr<EventListener>);
-        EventListener* onwaiting() const;
-        void setOnwaiting(PassRefPtr<EventListener>);
-        EventListener* onloadstart() const;
-        void setOnloadstart(PassRefPtr<EventListener>);
-        EventListener* onprogress() const;
-        void setOnprogress(PassRefPtr<EventListener>);
-        EventListener* onstalled() const;
-        void setOnstalled(PassRefPtr<EventListener>);
-        EventListener* onsuspend() const;
-        void setOnsuspend(PassRefPtr<EventListener>);
-        EventListener* oninput() const;
-        void setOninput(PassRefPtr<EventListener>);
-        EventListener* onmessage() const;
-        void setOnmessage(PassRefPtr<EventListener>);
-        EventListener* oncontextmenu() const;
-        void setOncontextmenu(PassRefPtr<EventListener>);
-=======
 
         DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationstart, webkitAnimationStart);
         DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationiteration, webkitAnimationIteration);
         DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationend, webkitAnimationEnd);
         DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkittransitionend, webkitTransitionEnd);
->>>>>>> webkit.org at 49305:WebCore/page/DOMWindow.h
+
+#if ENABLE(TOUCH_EVENTS) // Android
+        EventListener* ontouchstart() const;
+        void setOntouchstart(PassRefPtr<EventListener>);
+        EventListener* ontouchend() const;
+        void setOntouchend(PassRefPtr<EventListener>);
+        EventListener* ontouchmove() const;
+        void setOntouchmove(PassRefPtr<EventListener>);
+        EventListener* ontouchcancel() const;
+        void setOntouchcancel(PassRefPtr<EventListener>);
+#endif
 
         void captureEvents();
         void releaseEvents();
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h
index 3348366..daf5a67 100644
--- a/WebCore/page/EventHandler.h
+++ b/WebCore/page/EventHandler.h
@@ -143,14 +143,11 @@ public:
     bool handleMouseReleaseEvent(const PlatformMouseEvent&);
     bool handleWheelEvent(PlatformWheelEvent&);
 
-<<<<<<< HEAD:WebCore/page/EventHandler.h
 #if ENABLE(TOUCH_EVENTS) // Android
     bool handleTouchEvent(const PlatformTouchEvent&);
 #endif
 
-=======
 #if ENABLE(CONTEXT_MENUS)
->>>>>>> webkit.org at 49305:WebCore/page/EventHandler.h
     bool sendContextMenuEvent(const PlatformMouseEvent&);
 #endif
 
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 1ded2af..bf877e6 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -41,11 +41,8 @@
 
 namespace WebCore {
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 static const char* permissionDeniedErrorMessage = "User denied Geolocation";
 
-=======
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 Geolocation::GeoNotifier::GeoNotifier(Geolocation* geolocation, PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options)
     : m_geolocation(geolocation)
     , m_successCallback(successCallback)
@@ -63,30 +60,15 @@ Geolocation::GeoNotifier::GeoNotifier(Geolocation* geolocation, PassRefPtr<Posit
 
 void Geolocation::GeoNotifier::setFatalError(PassRefPtr<PositionError> error)
 {
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     m_fatalError = error;
     m_timer.startOneShot(0);
-=======
-    ASSERT(m_successCallback);
-    // If no options were supplied from JS, we should have created a default set
-    // of options in JSGeolocationCustom.cpp.
-    ASSERT(m_options);
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 }
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 void Geolocation::GeoNotifier::setCachedPosition(Geoposition* cachedPosition)
-=======
-bool Geolocation::GeoNotifier::hasZeroTimeout() const
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 {
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     // We do not take owenership from the caller, but add our own ref count.
     m_cachedPosition = cachedPosition;
     m_timer.startOneShot(0);
-=======
-    return m_options->hasTimeout() && m_options->timeout() == 0;
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 }
 
 void Geolocation::GeoNotifier::startTimerIfNeeded()
@@ -99,7 +81,6 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*)
 {
     m_timer.stop();
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     if (m_fatalError) {
         if (m_errorCallback)
             m_errorCallback->handleEvent(m_fatalError.get());
@@ -114,14 +95,8 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*)
         return;
     }
 
-=======
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     if (m_errorCallback) {
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
         RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, "Timed out");
-=======
-        RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, "Timeout expired");
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
         m_errorCallback->handleEvent(error.get());
     }
     m_geolocation->requestTimedOut(this);
@@ -299,55 +274,23 @@ void Geolocation::disconnectFrame()
 
 void Geolocation::getCurrentPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options)
 {
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     RefPtr<GeoNotifier> notifier = makeRequest(successCallback, errorCallback, options);
     ASSERT(notifier);
-=======
-    RefPtr<GeoNotifier> notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
-
-    if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get()))
-        notifier->startTimerIfNeeded();
-    else {
-        if (notifier->m_errorCallback) {
-            RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, "Unable to Start");
-            notifier->m_errorCallback->handleEvent(error.get());
-        }
-        return;
-    }
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 
     m_oneShots.add(notifier);
 }
 
 int Geolocation::watchPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options)
 {
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     RefPtr<GeoNotifier> notifier = makeRequest(successCallback, errorCallback, options);
     ASSERT(notifier);
-=======
-    RefPtr<GeoNotifier> notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
-=======
-    if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get()))
-        notifier->startTimerIfNeeded();
-    else {
-        if (notifier->m_errorCallback) {
-            RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, "Unable to Start");
-            notifier->m_errorCallback->handleEvent(error.get());
-        }
-        return 0;
-    }
-    
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     static int sIdentifier = 0;
     m_watchers.set(++sIdentifier, notifier);
 
     return sIdentifier;
 }
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 PassRefPtr<Geolocation::GeoNotifier> Geolocation::makeRequest(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options)
 {
     RefPtr<GeoNotifier> notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
@@ -391,8 +334,6 @@ void Geolocation::fatalErrorOccurred(Geolocation::GeoNotifier* notifier)
         m_service->stopUpdating();
 }
 
-=======
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 void Geolocation::requestTimedOut(GeoNotifier* notifier)
 {
     // If this is a one-shot request, stop it.
@@ -402,7 +343,6 @@ void Geolocation::requestTimedOut(GeoNotifier* notifier)
         m_service->stopUpdating();
 }
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 void Geolocation::requestReturnedCachedPosition(GeoNotifier* notifier)
 {
     // If this is a one-shot request, stop it.
@@ -432,8 +372,6 @@ bool Geolocation::haveSuitableCachedPosition(PositionOptions* options)
     return m_cachedPositionManager->cachedPosition()->timestamp() > currentTimeMillis - options->maximumAge();
 }
 
-=======
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 void Geolocation::clearWatch(int watchId)
 {
     m_watchers.remove(watchId);
@@ -459,17 +397,9 @@ void Geolocation::setIsAllowed(bool allowed)
     // This may be due to either a new position from the service, or a cached
     // position.
     m_allowGeolocation = allowed ? Yes : No;
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 
     if (!isAllowed()) {
         RefPtr<WebCore::PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage);
-=======
-    
-    if (isAllowed())
-        makeSuccessCallbacks();
-    else {
-        RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, "User disallowed Geolocation");
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
         error->setIsFatal(true);
         handleError(error.get());
         return;
@@ -506,10 +436,7 @@ void Geolocation::sendPosition(Vector<RefPtr<GeoNotifier> >& notifiers, Geoposit
         RefPtr<GeoNotifier> notifier = *it;
         ASSERT(notifier->m_successCallback);
         
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
         notifier->m_timer.stop();
-=======
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
         notifier->m_successCallback->handleEvent(position);
     }
 }
@@ -548,29 +475,15 @@ void Geolocation::stopTimers()
 void Geolocation::handleError(PositionError* error)
 {
     ASSERT(error);
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
-=======
-    
-    Vector<RefPtr<GeoNotifier> > oneShotsCopy;
-    copyToVector(m_oneShots, oneShotsCopy);
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     Vector<RefPtr<GeoNotifier> > oneShotsCopy;
     copyToVector(m_oneShots, oneShotsCopy);
 
-=======
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     Vector<RefPtr<GeoNotifier> > watchersCopy;
     copyValuesToVector(m_watchers, watchersCopy);
 
     // Clear the lists before we make the callbacks, to avoid clearing notifiers
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     // added by calls to Geolocation methods from the callbacks.
-=======
-    // added by calls to Geolocation methods from the callbacks, and to prevent
-    // further callbacks to these notifiers.
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     m_oneShots.clear();
     if (error->isFatal())
         m_watchers.clear();
@@ -602,32 +515,17 @@ void Geolocation::requestPermission()
 
 void Geolocation::geolocationServicePositionChanged(GeolocationService*)
 {
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
-=======
-    ASSERT_UNUSED(service, service == m_service);
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     ASSERT(m_service->lastPosition());
 
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     m_cachedPositionManager->setCachedPosition(m_service->lastPosition());
 
-=======
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     // Stop all currently running timers.
     stopTimers();
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 
-=======
-    
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     if (!isAllowed()) {
         // requestPermission() will ask the chrome for permission. This may be
         // implemented synchronously or asynchronously. In both cases,
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
         // makeSucessCallbacks() will be called if permission is granted, so
-=======
-        // makeSuccessCallbacks() will be called if permission is granted, so
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
         // there's nothing more to do here.
         requestPermission();
         return;
@@ -640,32 +538,15 @@ void Geolocation::makeSuccessCallbacks()
 {
     ASSERT(m_service->lastPosition());
     ASSERT(isAllowed());
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 
-=======
-    
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     Vector<RefPtr<GeoNotifier> > oneShotsCopy;
     copyToVector(m_oneShots, oneShotsCopy);
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 
-=======
-    
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     Vector<RefPtr<GeoNotifier> > watchersCopy;
     copyValuesToVector(m_watchers, watchersCopy);
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
 
-=======
-    
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     // Clear the lists before we make the callbacks, to avoid clearing notifiers
-<<<<<<< HEAD:WebCore/page/Geolocation.cpp
     // added by calls to Geolocation methods from the callbacks.
-=======
-    // added by calls to Geolocation methods from the callbacks, and to prevent
-    // further callbacks to these notifiers.
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp
     m_oneShots.clear();
 
     sendPosition(oneShotsCopy, m_service->lastPosition());
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index 5b3d156..9b3b43f 100644
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -82,12 +82,8 @@ private:
     public:
         static PassRefPtr<GeoNotifier> create(Geolocation* geolocation, PassRefPtr<PositionCallback> positionCallback, PassRefPtr<PositionErrorCallback> positionErrorCallback, PassRefPtr<PositionOptions> options) { return adoptRef(new GeoNotifier(geolocation, positionCallback, positionErrorCallback, options)); }
         
-<<<<<<< HEAD:WebCore/page/Geolocation.h
         void setFatalError(PassRefPtr<PositionError> error);
         void setCachedPosition(Geoposition* cachedPosition);
-=======
-        bool hasZeroTimeout() const;
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h
         void startTimerIfNeeded();
         void timerFired(Timer<GeoNotifier>*);
         
@@ -100,22 +96,14 @@ private:
         RefPtr<Geoposition> m_cachedPosition;
 
     private:
-<<<<<<< HEAD:WebCore/page/Geolocation.h
         GeoNotifier(Geolocation* geolocation, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
-=======
-        GeoNotifier(Geolocation*, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h
     };
 
     bool hasListeners() const { return !m_oneShots.isEmpty() || !m_watchers.isEmpty(); }
 
     void sendError(Vector<RefPtr<GeoNotifier> >&, PositionError*);
     void sendPosition(Vector<RefPtr<GeoNotifier> >&, Geoposition*);
-<<<<<<< HEAD:WebCore/page/Geolocation.h
 
-=======
-    
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h
     static void stopTimer(Vector<RefPtr<GeoNotifier> >&);
     void stopTimersForOneShots();
     void stopTimersForWatchers();
@@ -131,20 +119,13 @@ private:
     virtual void geolocationServicePositionChanged(GeolocationService*);
     virtual void geolocationServiceErrorOccurred(GeolocationService*);
 
-<<<<<<< HEAD:WebCore/page/Geolocation.h
     // EventListener
     virtual void handleEvent(Event*, bool isWindowEvent);
 
-=======
-<<<<<<< HEAD:WebCore/page/Geolocation.h
->>>>>>> Merge webkit.org at R49305 : Automatic merge by git.:WebCore/page/Geolocation.h
     void fatalErrorOccurred(GeoNotifier* notifier);
     void requestTimedOut(GeoNotifier* notifier);
     void requestReturnedCachedPosition(GeoNotifier* notifier);
     bool haveSuitableCachedPosition(PositionOptions*);
-=======
-    void requestTimedOut(GeoNotifier*);
->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h
 
     typedef HashSet<RefPtr<GeoNotifier> > GeoNotifierSet;
     typedef HashMap<int, RefPtr<GeoNotifier> > GeoNotifierMap;
diff --git a/WebCore/page/PositionCallback.h b/WebCore/page/PositionCallback.h
index 30da2c1..9f36d7a 100644
--- a/WebCore/page/PositionCallback.h
+++ b/WebCore/page/PositionCallback.h
@@ -36,11 +36,7 @@ namespace WebCore {
     class PositionCallback : public RefCounted<PositionCallback> {
     public:
         virtual ~PositionCallback() { }
-<<<<<<< HEAD:WebCore/page/PositionCallback.h
-        virtual void handleEvent(Geoposition* position) = 0;
-=======
         virtual void handleEvent(Geoposition*) = 0;
->>>>>>> webkit.org at 49305:WebCore/page/PositionCallback.h
     };
     
 } // namespace WebCore
diff --git a/WebCore/page/PositionError.h b/WebCore/page/PositionError.h
index 5c26fcc..f6f56f0 100644
--- a/WebCore/page/PositionError.h
+++ b/WebCore/page/PositionError.h
@@ -46,11 +46,7 @@ public:
     ErrorCode code() const { return m_code; }
     const String& message() const { return m_message; }
     void setIsFatal(bool isFatal) { m_isFatal = isFatal; }
-<<<<<<< HEAD:WebCore/page/PositionError.h
-    bool isFatal() { return m_isFatal; }
-=======
     bool isFatal() const { return m_isFatal; }
->>>>>>> webkit.org at 49305:WebCore/page/PositionError.h
     
 private:
     PositionError(ErrorCode code, const String& message) 
diff --git a/WebCore/page/PositionOptions.h b/WebCore/page/PositionOptions.h
index b1746a8..5cb66f7 100644
--- a/WebCore/page/PositionOptions.h
+++ b/WebCore/page/PositionOptions.h
@@ -33,11 +33,7 @@ namespace WebCore {
     
 class PositionOptions : public RefCounted<PositionOptions> {
 public:
-<<<<<<< HEAD:WebCore/page/PositionOptions.h
-    static PassRefPtr<PositionOptions> create() { return adoptRef(new PositionOptions); }
-=======
     static PassRefPtr<PositionOptions> create() { return adoptRef(new PositionOptions()); }
->>>>>>> webkit.org at 49305:WebCore/page/PositionOptions.h
 
     bool enableHighAccuracy() const { return m_highAccuracy; }
     void setEnableHighAccuracy(bool enable) { m_highAccuracy = enable; }