webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 2 insertions, 7 deletions

diff --git a/Source/WebCore/Modules/proximity/DeviceProximityController.cpp b/Source/WebCore/Modules/proximity/DeviceProximityController.cpp
index a64d47ac6..68ea296af 100644
--- a/Source/WebCore/Modules/proximity/DeviceProximityController.cpp
+++ b/Source/WebCore/Modules/proximity/DeviceProximityController.cpp
@@ -40,11 +40,6 @@ DeviceProximityController::DeviceProximityController(DeviceProximityClient* clie
     ASSERT(m_client);
 }
 
-PassOwnPtr<DeviceProximityController> DeviceProximityController::create(DeviceProximityClient* client)
-{
-    return adoptPtr(new DeviceProximityController(client));
-}
-
 void DeviceProximityController::didChangeDeviceProximity(const double value, const double min, const double max)
 {
     ASSERT(value >= min && value <= max);
@@ -62,7 +57,7 @@ bool DeviceProximityController::hasLastData()
     return deviceProximityClient()->hasLastData();
 }
 
-PassRefPtr<Event> DeviceProximityController::getLastEvent()
+RefPtr<Event> DeviceProximityController::getLastEvent()
 {
     return DeviceProximityEvent::create(eventNames().webkitdeviceproximityEvent, deviceProximityClient()->value(), deviceProximityClient()->min(), deviceProximityClient()->max());
 }
@@ -86,7 +81,7 @@ bool DeviceProximityController::isActiveAt(Page* page)
 
 void provideDeviceProximityTo(Page* page, DeviceProximityClient* client)
 {
-    DeviceProximityController::provideTo(page, DeviceProximityController::supplementName(), DeviceProximityController::create(client));
+    DeviceProximityController::provideTo(page, DeviceProximityController::supplementName(), std::make_unique<DeviceProximityController>(client));
 }
 
 } // namespace WebCore