diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 18:34:51 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:13 +0000 |
| commit | 3f60c26c3fa9dc89d57ef4db083a4f13ef86c103 (patch) | |
| tree | 81c16accd4c9b2b2e4e29ec18b9e5fa7eb37ed93 /WebCore/page/Geolocation.h | |
| parent | cac0f67c402d107cdb10971b95719e2ff9c7c76b (diff) | |
| download | external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.zip external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.gz external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.bz2 | |
Merge webkit.org at r50258 : Fix conflicts.
Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor.
See http://trac.webkit.org/changeset/49608
Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
Diffstat (limited to 'WebCore/page/Geolocation.h')
| -rw-r--r-- | WebCore/page/Geolocation.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index f5e05a6..d9b23c4 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -94,10 +94,7 @@ private: RefPtr<PositionOptions> m_options; Timer<GeoNotifier> m_timer; RefPtr<PositionError> m_fatalError; -<<<<<<< HEAD:WebCore/page/Geolocation.h RefPtr<Geoposition> m_cachedPosition; -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.h private: GeoNotifier(Geolocation*, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); @@ -139,13 +136,10 @@ private: PassRefPtr<GeoNotifier> startRequest(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); -<<<<<<< HEAD:WebCore/page/Geolocation.h // EventListener virtual bool operator==(const EventListener&); virtual void handleEvent(ScriptExecutionContext*, Event*); -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.h void fatalErrorOccurred(GeoNotifier*); void requestTimedOut(GeoNotifier*); void requestReturnedCachedPosition(GeoNotifier*); |