Separate GeolocationWatchers from Geolocation

Source/modules/geolocation/Geolocation.h

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Geolocation_h
 #define Geolocation_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "modules/geolocation/GeoNotifier.h"
+#include "modules/geolocation/GeolocationWatchers.h"
 #include "modules/geolocation/Geoposition.h"
 #include "modules/geolocation/PositionCallback.h"
 #include "modules/geolocation/PositionError.h"
 #include "modules/geolocation/PositionErrorCallback.h"
 #include "modules/geolocation/PositionOptions.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
@@ skipping 60 matching lines @@
     // Returns the last known position, if any. May return null.
     Geoposition* lastPosition();
 
     bool isDenied() const { return m_geolocationPermission == PermissionDenied; }
 
     explicit Geolocation(ExecutionContext*);
 
     typedef HeapVector<Member<GeoNotifier> > GeoNotifierVector;
     typedef HeapHashSet<Member<GeoNotifier> > GeoNotifierSet;
 
-    class Watchers {
-        DISALLOW_ALLOCATION();
-    public:
-        void trace(Visitor*);
-        bool add(int id, GeoNotifier*);
-        GeoNotifier* find(int id);
-        void remove(int id);
-        void remove(GeoNotifier*);
-        bool contains(GeoNotifier*) const;
-        void clear();
-        bool isEmpty() const;
-        void getNotifiersVector(GeoNotifierVector&) const;
-    private:
-        typedef HeapHashMap<int, Member<GeoNotifier> > IdToNotifierMap;
-        typedef HeapHashMap<Member<GeoNotifier>, int> NotifierToIdMap;
-        IdToNotifierMap m_idToNotifierMap;
-        NotifierToIdMap m_notifierToIdMap;
-    };
-
     bool hasListeners() const { return !m_oneShots.isEmpty() || !m_watchers.isEmpty(); }
 
     void sendError(GeoNotifierVector&, PositionError*);
     void sendPosition(GeoNotifierVector&, Geoposition*);
 
     // Removes notifiers that use a cached position from |notifiers| and
     // if |cached| is not null they are added to it.
     static void extractNotifiersWithCachedPosition(GeoNotifierVector& notifiers, GeoNotifierVector* cached);
 
     // Copies notifiers from |src| vector to |dest| set.
@@ skipping 38 matching lines @@
     // fatal error if permission is denied or no position can be obtained.
     void startRequest(GeoNotifier*);
 
     bool haveSuitableCachedPosition(PositionOptions*);
 
     // Runs the success callbacks for the set of notifiers awaiting a cached
     // position, the set is then cleared. The oneshots are removed everywhere.
     void makeCachedPositionCallbacks();
 
     GeoNotifierSet m_oneShots;
-    Watchers m_watchers;
+    GeolocationWatchers m_watchers;
     GeoNotifierSet m_pendingForPermissionNotifiers;
     Member<Geoposition> m_lastPosition;
 
     // States of Geolocation permission as granted by the embedder. Unknown
     // means that the embedder still has to be asked for the current permission
     // level; Requested means that the user has yet to make a decision.
     enum Permission {
         PermissionUnknown,
         PermissionRequested,
         PermissionAllowed,
         PermissionDenied
     };
 
     Permission m_geolocationPermission;
 
     GeoNotifierSet m_requestsAwaitingCachedPosition;
 };
 
 } // namespace blink
 
 #endif // Geolocation_h