Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/modules/geolocation/GeolocationInspectorAgent.cpp b/src/third_party/WebKit/Source/modules/geolocation/GeolocationInspectorAgent.cpp
index 049d821..5a1bd90 100644 (file)
--- a/src/third_party/WebKit/Source/modules/geolocation/GeolocationInspectorAgent.cpp
+++ b/src/third_party/WebKit/Source/modules/geolocation/GeolocationInspectorAgent.cpp
@@ -33,11 +33,11 @@
 
 #include "modules/geolocation/GeolocationController.h"
 
-namespace WebCore {
+namespace blink {
 
-PassOwnPtr<GeolocationInspectorAgent> GeolocationInspectorAgent::create()
+PassOwnPtrWillBeRawPtr<GeolocationInspectorAgent> GeolocationInspectorAgent::create()
 {
-    return adoptPtr(new GeolocationInspectorAgent());
+    return adoptPtrWillBeNoop(new GeolocationInspectorAgent());
 }
 
 GeolocationInspectorAgent::~GeolocationInspectorAgent()
@@ -89,14 +89,24 @@ GeolocationPosition* GeolocationInspectorAgent::overrideGeolocationPosition(Geol
     return position;
 }
 
-void GeolocationInspectorAgent::AddController(GeolocationController* controller)
+void GeolocationInspectorAgent::addController(GeolocationController* controller)
 {
     m_controllers.add(controller);
 }
 
-void GeolocationInspectorAgent::RemoveController(GeolocationController* controller)
+void GeolocationInspectorAgent::removeController(GeolocationController* controller)
 {
     m_controllers.remove(controller);
 }
 
-} // namespace WebCore
+void GeolocationInspectorAgent::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_controllers);
+#endif
+    visitor->trace(m_geolocationPosition);
+    visitor->trace(m_platformGeolocationPosition);
+    InspectorBaseAgent::trace(visitor);
+}
+
+} // namespace blink