Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(846)

Unified Diff: Source/modules/geolocation/testing/GeolocationClientMock.h

Issue 490143002: Move GeolocationClient to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Provide default empty impl of WebGeolocationClient::geolocationDestroyed() virtual Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/geolocation/testing/GeolocationClientMock.h
diff --git a/Source/modules/geolocation/testing/GeolocationClientMock.h b/Source/modules/geolocation/testing/GeolocationClientMock.h
index b395b12cbfd5c504ab33a85263e30fe791f07805..91168a422fcb91684c32c26aff8e1c5c6a598f92 100644
--- a/Source/modules/geolocation/testing/GeolocationClientMock.h
+++ b/Source/modules/geolocation/testing/GeolocationClientMock.h
@@ -55,7 +55,6 @@ public:
int numberOfPendingPermissionRequests() const;
// GeolocationClient
- virtual void geolocationDestroyed() OVERRIDE;
virtual void startUpdating() OVERRIDE;
virtual void stopUpdating() OVERRIDE;
virtual void setEnableHighAccuracy(bool) OVERRIDE;
@@ -65,6 +64,8 @@ public:
void controllerForTestAdded(GeolocationController*) OVERRIDE;
void controllerForTestRemoved(GeolocationController*) OVERRIDE;
+ virtual void trace(Visitor*) OVERRIDE;
+
private:
void asyncUpdateController();
void controllerTimerFired(Timer<GeolocationClientMock>*);
@@ -74,9 +75,10 @@ private:
void clearError();
- typedef WillBeHeapHashSet<RawPtrWillBeMember<GeolocationController> > GeolocationControllers;
- WillBePersistentHeapHashSet<RawPtrWillBeMember<GeolocationController> > m_controllers;
- Persistent<GeolocationPosition> m_lastPosition;
+ typedef WillBeHeapHashSet<RawPtrWillBeWeakMember<GeolocationController> > GeolocationControllers;
+ GeolocationControllers m_controllers;
+
+ PersistentWillBeMember<GeolocationPosition> m_lastPosition;
bool m_hasError;
String m_errorMessage;
Timer<GeolocationClientMock> m_controllerTimer;
@@ -90,8 +92,9 @@ private:
};
PermissionState m_permissionState;
- typedef HeapHashSet<Member<Geolocation> > GeolocationSet;
- PersistentHeapHashSet<Member<Geolocation> > m_pendingPermissions;
+
+ typedef PersistentHeapHashSetWillBeHeapHashSet<Member<Geolocation> > GeolocationSet;
+ GeolocationSet m_pendingPermissions;
};
}

Powered by Google App Engine
This is Rietveld 408576698