Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / geolocation / Geolocation.cpp

diff --git a/src/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/src/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
index 8a3c5a9..1aa1d4f 100644 (file)
--- a/src/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
+++ b/src/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
@@ -87,7 +87,6 @@ Geolocation::Geolocation(ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_geolocationPermission(PermissionUnknown)
 {
-    ScriptWrappable::init(this);
 }
 
 Geolocation::~Geolocation()
@@ -138,7 +137,7 @@ Geoposition* Geolocation::lastPosition()
     return m_lastPosition.get();
 }
 
-void Geolocation::getCurrentPosition(PassOwnPtr<PositionCallback> successCallback, PassOwnPtr<PositionErrorCallback> errorCallback, const Dictionary& options)
+void Geolocation::getCurrentPosition(PositionCallback* successCallback, PositionErrorCallback* errorCallback, const Dictionary& options)
 {
     if (!frame())
         return;
@@ -149,7 +148,7 @@ void Geolocation::getCurrentPosition(PassOwnPtr<PositionCallback> successCallbac
     m_oneShots.add(notifier);
 }
 
-int Geolocation::watchPosition(PassOwnPtr<PositionCallback> successCallback, PassOwnPtr<PositionErrorCallback> errorCallback, const Dictionary& options)
+int Geolocation::watchPosition(PositionCallback* successCallback, PositionErrorCallback* errorCallback, const Dictionary& options)
 {
     if (!frame())
         return 0;