Oilpan: Move GeolocationController back to off-heap

Source/modules/geolocation/GeolocationController.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 78 matching lines @@
     if (m_hasClientForTest)
         m_client->controllerForTestRemoved(this);
 }
 
 void GeolocationController::willBeDestroyed()
 {
     if (m_client)
         m_client->geolocationDestroyed();
 }
 
-PassOwnPtrWillBeRawPtr<GeolocationController> GeolocationController::create(LocalFrame& frame, GeolocationClient* client)
+PassOwnPtr<GeolocationController> GeolocationController::create(LocalFrame& frame, GeolocationClient* client)
 {
-    return adoptPtrWillBeNoop(new GeolocationController(frame, client));
+    return adoptPtr(new GeolocationController(frame, client));
 }
 
 void GeolocationController::addObserver(Geolocation* observer, bool enableHighAccuracy)
 {
     // This may be called multiple times with the same observer, though removeObserver()
     // is called only once with each.
     bool wasEmpty = m_observers.isEmpty();
     m_observers.add(observer);
     if (enableHighAccuracy)
         m_highAccuracyObservers.add(observer);
@@ skipping 35 matching lines @@
 }
 
 void GeolocationController::positionChanged(GeolocationPosition* position)
 {
     position = m_inspectorAgent->overrideGeolocationPosition(position);
     if (!position) {
         errorOccurred(GeolocationError::create(GeolocationError::PositionUnavailable, "PositionUnavailable").get());
         return;
     }
     m_lastPosition = position;
-    WillBeHeapVector<RefPtrWillBeMember<Geolocation> > observersVector;
+    WillBePersistentHeapVector<RefPtrWillBeMember<Geolocation> > observersVector;

[Mads Ager (chromium), 2014/06/04 06:20:15]

This is on the stack, so we should be able to still use WillBeHeapVector here?
There is no need for the persistent on the stack. The conservative stack
scanning will find the temporary vector.

     copyToVector(m_observers, observersVector);
     for (size_t i = 0; i < observersVector.size(); ++i)
         observersVector[i]->positionChanged();
 }
 
 void GeolocationController::errorOccurred(GeolocationError* error)
 {
-    WillBeHeapVector<RefPtrWillBeMember<Geolocation> > observersVector;
+    WillBePersistentHeapVector<RefPtrWillBeMember<Geolocation> > observersVector;

[Mads Ager (chromium), 2014/06/04 06:20:15]

Ditto.

     copyToVector(m_observers, observersVector);
     for (size_t i = 0; i < observersVector.size(); ++i)
         observersVector[i]->setError(error);
 }
 
 GeolocationPosition* GeolocationController::lastPosition()
 {
     if (m_lastPosition.get())
         return m_lastPosition.get();
 
@@ skipping 20 matching lines @@
         startUpdatingIfNeeded();
     else
         stopUpdatingIfNeeded();
 }
 
 const char* GeolocationController::supplementName()
 {
     return "GeolocationController";
 }
 
-void GeolocationController::trace(Visitor* visitor)
-{
-    visitor->trace(m_lastPosition);
-    visitor->trace(m_observers);
-    visitor->trace(m_highAccuracyObservers);
-    WillBeHeapSupplement<LocalFrame>::trace(visitor);
-}
-
 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client)
 {
-    WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::supplementName(), GeolocationController::create(frame, client));
+    Supplement<LocalFrame>::provideTo(frame, GeolocationController::supplementName(), GeolocationController::create(frame, client));
 }
 
 } // namespace WebCore