Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / device_orientation / DeviceMotionData.cpp

diff --git a/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp b/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp
index f0b9213..d2a7bcf 100644 (file)
--- a/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp
+++ b/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp
@@ -27,13 +27,12 @@
 #include "modules/device_orientation/DeviceMotionData.h"
 #include "public/platform/WebDeviceMotionData.h"
 
-namespace WebCore {
+namespace blink {
 
-PassRefPtr<DeviceMotionData::Acceleration> DeviceMotionData::Acceleration::create(bool canProvideX, double x,
-                                                                                  bool canProvideY, double y,
-                                                                                  bool canProvideZ, double z)
+DeviceMotionData::Acceleration* DeviceMotionData::Acceleration::create(
+    bool canProvideX, double x, bool canProvideY, double y, bool canProvideZ, double z)
 {
-    return adoptRef(new DeviceMotionData::Acceleration(canProvideX, x, canProvideY, y, canProvideZ, z));
+    return new DeviceMotionData::Acceleration(canProvideX, x, canProvideY, y, canProvideZ, z);
 }
 
 DeviceMotionData::Acceleration::Acceleration(bool canProvideX, double x, bool canProvideY, double y, bool canProvideZ, double z)
@@ -47,11 +46,10 @@ DeviceMotionData::Acceleration::Acceleration(bool canProvideX, double x, bool ca
 {
 }
 
-PassRefPtr<DeviceMotionData::RotationRate> DeviceMotionData::RotationRate::create(bool canProvideAlpha, double alpha,
-                                                                                  bool canProvideBeta, double beta,
-                                                                                  bool canProvideGamma, double gamma)
+DeviceMotionData::RotationRate* DeviceMotionData::RotationRate::create(
+    bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
 {
-    return adoptRef(new DeviceMotionData::RotationRate(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma));
+    return new DeviceMotionData::RotationRate(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma);
 }
 
 DeviceMotionData::RotationRate::RotationRate(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
@@ -64,18 +62,22 @@ DeviceMotionData::RotationRate::RotationRate(bool canProvideAlpha, double alpha,
 {
 }
 
-PassRefPtr<DeviceMotionData> DeviceMotionData::create()
+DeviceMotionData* DeviceMotionData::create()
 {
-    return adoptRef(new DeviceMotionData);
+    return new DeviceMotionData;
 }
 
-PassRefPtr<DeviceMotionData> DeviceMotionData::create(PassRefPtr<Acceleration> acceleration, PassRefPtr<Acceleration> accelerationIncludingGravity,
-                                                      PassRefPtr<RotationRate> rotationRate, bool canProvideInterval, double interval)
+DeviceMotionData* DeviceMotionData::create(
+    Acceleration* acceleration,
+    Acceleration* accelerationIncludingGravity,
+    RotationRate* rotationRate,
+    bool canProvideInterval,
+    double interval)
 {
-    return adoptRef(new DeviceMotionData(acceleration, accelerationIncludingGravity, rotationRate, canProvideInterval, interval));
+    return new DeviceMotionData(acceleration, accelerationIncludingGravity, rotationRate, canProvideInterval, interval);
 }
 
-PassRefPtr<DeviceMotionData> DeviceMotionData::create(const blink::WebDeviceMotionData& data)
+DeviceMotionData* DeviceMotionData::create(const WebDeviceMotionData& data)
 {
     return DeviceMotionData::create(
         DeviceMotionData::Acceleration::create(
@@ -99,8 +101,12 @@ DeviceMotionData::DeviceMotionData()
 {
 }
 
-DeviceMotionData::DeviceMotionData(PassRefPtr<Acceleration> acceleration, PassRefPtr<Acceleration> accelerationIncludingGravity,
-                                   PassRefPtr<RotationRate> rotationRate, bool canProvideInterval, double interval)
+DeviceMotionData::DeviceMotionData(
+    Acceleration* acceleration,
+    Acceleration* accelerationIncludingGravity,
+    RotationRate* rotationRate,
+    bool canProvideInterval,
+    double interval)
     : m_acceleration(acceleration)
     , m_accelerationIncludingGravity(accelerationIncludingGravity)
     , m_rotationRate(rotationRate)
@@ -109,6 +115,13 @@ DeviceMotionData::DeviceMotionData(PassRefPtr<Acceleration> acceleration, PassRe
 {
 }
 
+void DeviceMotionData::trace(Visitor* visitor)
+{
+    visitor->trace(m_acceleration);
+    visitor->trace(m_accelerationIncludingGravity);
+    visitor->trace(m_rotationRate);
+}
+
 bool DeviceMotionData::canProvideEventData() const
 {
     const bool hasAcceleration = m_acceleration && (m_acceleration->canProvideX() || m_acceleration->canProvideY() || m_acceleration->canProvideZ());
@@ -118,4 +131,4 @@ bool DeviceMotionData::canProvideEventData() const
     return hasAcceleration || hasAccelerationIncludingGravity || hasRotationRate;
 }
 
-} // namespace WebCore
+} // namespace blink