WebGeolocationController: improve handling of bare GeolocationController*

third_party/WebKit/public/web/WebGeolocationController.h

 /*
  * Copyright (C) 2010 Google 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
@@ skipping 10 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebGeolocationController_h
 #define WebGeolocationController_h
 
 #include "../platform/WebCommon.h"
 #include "../platform/WebNonCopyable.h"
+#include "../platform/WebPrivatePtr.h"
 
 namespace blink {
 
 class GeolocationController;
+class GeolocationControllerPrivate;
 class WebGeolocationPosition;
 class WebGeolocationError;
 
 class WebGeolocationController : public WebNonCopyable {
 public:
+    ~WebGeolocationController() { reset(); }
+
     BLINK_EXPORT void positionChanged(const WebGeolocationPosition&);
     BLINK_EXPORT void errorOccurred(const WebGeolocationError&);
 
 #if BLINK_IMPLEMENTATION
-    WebGeolocationController(GeolocationController* c)
-        : m_private(c)
-    {
-    }
-
-    GeolocationController* controller() const { return m_private; }
+    WebGeolocationController(GeolocationController*);
 #endif
 
 private:
     // No implementation for the default constructor. Declared private to ensure that no instances
     // can be created by the consumers of Chromium WebKit.
     WebGeolocationController();
 
-    // This bare pointer is owned and kept alive by the frame of the
-    // WebLocalFrame which creates this controller object.
-    GeolocationController* m_private;
+    BLINK_EXPORT void reset();
+
+    WebPrivatePtr<GeolocationControllerPrivate> m_private;
 };
 
 } // namespace blink
 
 #endif // WebGeolocationController_h