diff options
| author | Steve Block <steveblock@google.com> | 2010-03-11 11:48:12 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-03-11 11:48:12 +0000 |
| commit | 4e7b6178ebab6565493a92eeeba3a6e8f1a00f56 (patch) | |
| tree | a856ea9f43db56ba9b58af8f8e96024b6b199dcb /WebCore | |
| parent | 159531f4ce4c04455cd544a7c0f7c1644a50ccbe (diff) | |
| download | external_webkit-4e7b6178ebab6565493a92eeeba3a6e8f1a00f56.zip external_webkit-4e7b6178ebab6565493a92eeeba3a6e8f1a00f56.tar.gz external_webkit-4e7b6178ebab6565493a92eeeba3a6e8f1a00f56.tar.bz2 | |
Marks remaining Android-specific changes to Geolocation with ANDROID
Change-Id: I23e2ef2ec23b340e0bfe8bbf0e71e2c675fda676
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/page/Geolocation.cpp | 12 | ||||
| -rw-r--r-- | WebCore/page/Geolocation.h | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index ad5f8d6..6085b32 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -29,9 +29,13 @@ #include "Geolocation.h" #include "Chrome.h" +// ANDROID #include "DOMWindow.h" +// END ANDROID #include "Document.h" +// ANDROID #include "EventNames.h" +// END ANDROID #include "Frame.h" #include "Page.h" #include "PlatformBridge.h" @@ -203,8 +207,10 @@ void Geolocation::Watchers::getNotifiersVector(Vector<RefPtr<GeoNotifier> >& cop } Geolocation::Geolocation(Frame* frame) +// ANDROID : EventListener(GeolocationEventListenerType) , m_frame(frame) +// END ANDROID #if !ENABLE(CLIENT_BASED_GEOLOCATION) , m_service(GeolocationService::create(this)) #endif @@ -217,14 +223,18 @@ Geolocation::Geolocation(Frame* frame) ASSERT(m_frame->document()); m_frame->document()->setUsingGeolocation(true); +// ANDROID if (m_frame->domWindow()) m_frame->domWindow()->addEventListener(eventNames().unloadEvent, this, false); +// END ANDROID } Geolocation::~Geolocation() { +// ANDROID if (m_frame && m_frame->domWindow()) m_frame->domWindow()->removeEventListener(eventNames().unloadEvent, this, false); +// END ANDROID } void Geolocation::disconnectFrame() @@ -676,6 +686,7 @@ void Geolocation::stopUpdating() } +// ANDROID bool Geolocation::operator==(const EventListener& listener) { if (listener.type() != GeolocationEventListenerType) @@ -693,5 +704,6 @@ void Geolocation::handleEvent(ScriptExecutionContext*, Event* event) m_oneShots.clear(); m_watchers.clear(); } +// END ANDROID } // namespace WebCore diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index 2a282b5..b30deac 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -27,7 +27,9 @@ #ifndef Geolocation_h #define Geolocation_h +// ANDROID #include "EventListener.h" +// END ANDROID #include "GeolocationPositionCache.h" #include "GeolocationService.h" #include "Geoposition.h" @@ -54,7 +56,9 @@ class GeolocationPosition; class GeolocationError; #endif +// ANDROID class Geolocation : public EventListener +// END ANDROID #if !ENABLE(CLIENT_BASED_GEOLOCATION) , public GeolocationServiceClient #endif @@ -156,9 +160,11 @@ private: PassRefPtr<GeoNotifier> startRequest(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); +// ANDROID // EventListener virtual bool operator==(const EventListener&); virtual void handleEvent(ScriptExecutionContext*, Event*); +// END ANDROID void fatalErrorOccurred(GeoNotifier*); void requestTimedOut(GeoNotifier*); |