X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fmodules%2Fdevice_orientation%2FDeviceMotionData.h;h=879638cf67681ae2bb673a3d0290258b0fe37c74;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=39366089367af1164b6a763c120ac1fc0627c89f;hpb=172ee7c03df346ff158858709f7f6494e695e0e4;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h b/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h
index 3936608..879638c 100644
--- a/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h
+++ b/src/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h
@@ -26,21 +26,26 @@
 #ifndef DeviceMotionData_h
 #define DeviceMotionData_h
 
+#include "heap/Handle.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 
-namespace WebKit {
+namespace blink {
 class WebDeviceMotionData;
 }
 
 namespace WebCore {
 
-class DeviceMotionData : public RefCounted<DeviceMotionData> {
+class DeviceMotionData : public RefCountedWillBeGarbageCollected<DeviceMotionData> {
+    DECLARE_GC_INFO;
 public:
-    class Acceleration : public RefCounted<DeviceMotionData::Acceleration> {
+
+    class Acceleration : public RefCountedWillBeGarbageCollected<DeviceMotionData::Acceleration> {
+        DECLARE_GC_INFO;
     public:
-        static PassRefPtr<Acceleration> create(bool canProvideX, double x, bool canProvideY, double y, bool canProvideZ, double z);
+        static PassRefPtrWillBeRawPtr<Acceleration> create(bool canProvideX, double x, bool canProvideY, double y, bool canProvideZ, double z);
+        void trace(Visitor*) { }
 
         bool canProvideX() const { return m_canProvideX; }
         bool canProvideY() const { return m_canProvideY; }
@@ -62,9 +67,11 @@ public:
         bool m_canProvideZ;
     };
 
-    class RotationRate : public RefCounted<DeviceMotionData::RotationRate> {
+    class RotationRate : public RefCountedWillBeGarbageCollected<DeviceMotionData::RotationRate> {
+        DECLARE_GC_INFO;
     public:
-        static PassRefPtr<RotationRate> create(bool canProvideAlpha, double alpha, bool canProvideBeta,  double beta, bool canProvideGamma, double gamma);
+        static PassRefPtrWillBeRawPtr<RotationRate> create(bool canProvideAlpha, double alpha, bool canProvideBeta,  double beta, bool canProvideGamma, double gamma);
+        void trace(Visitor*) { }
 
         bool canProvideAlpha() const { return m_canProvideAlpha; }
         bool canProvideBeta() const { return m_canProvideBeta; }
@@ -86,14 +93,19 @@ public:
         bool m_canProvideGamma;
     };
 
-    static PassRefPtr<DeviceMotionData> create();
-    static PassRefPtr<DeviceMotionData> create(PassRefPtr<Acceleration> acceleration, PassRefPtr<Acceleration> accelerationIncludingGravity,
-                                               PassRefPtr<RotationRate> rotationRate, bool canProvideInterval, double interval);
-    static PassRefPtr<DeviceMotionData> create(const WebKit::WebDeviceMotionData&);
+    static PassRefPtrWillBeRawPtr<DeviceMotionData> create();
+    static PassRefPtrWillBeRawPtr<DeviceMotionData> create(
+        PassRefPtrWillBeRawPtr<Acceleration>,
+        PassRefPtrWillBeRawPtr<Acceleration> accelerationIncludingGravity,
+        PassRefPtrWillBeRawPtr<RotationRate>,
+        bool canProvideInterval,
+        double interval);
+    static PassRefPtrWillBeRawPtr<DeviceMotionData> create(const blink::WebDeviceMotionData&);
+    void trace(Visitor*);
 
-    PassRefPtr<Acceleration> acceleration() const { return m_acceleration; }
-    PassRefPtr<Acceleration> accelerationIncludingGravity() const { return m_accelerationIncludingGravity; }
-    PassRefPtr<RotationRate> rotationRate() const { return m_rotationRate; }
+    Acceleration* acceleration() const { return m_acceleration.get(); }
+    Acceleration* accelerationIncludingGravity() const { return m_accelerationIncludingGravity.get(); }
+    RotationRate* rotationRate() const { return m_rotationRate.get(); }
 
     bool canProvideInterval() const { return m_canProvideInterval; }
     double interval() const { return m_interval; }
@@ -102,12 +114,11 @@ public:
 
 private:
     DeviceMotionData();
-    DeviceMotionData(PassRefPtr<Acceleration> acceleration, PassRefPtr<Acceleration> accelerationIncludingGravity,
-                     PassRefPtr<RotationRate> rotationRate, bool canProvideInterval, double interval);
+    DeviceMotionData(PassRefPtrWillBeRawPtr<Acceleration>, PassRefPtrWillBeRawPtr<Acceleration> accelerationIncludingGravity, PassRefPtrWillBeRawPtr<RotationRate>, bool canProvideInterval, double interval);
 
-    RefPtr<Acceleration> m_acceleration;
-    RefPtr<Acceleration> m_accelerationIncludingGravity;
-    RefPtr<RotationRate> m_rotationRate;
+    RefPtrWillBeMember<Acceleration> m_acceleration;
+    RefPtrWillBeMember<Acceleration> m_accelerationIncludingGravity;
+    RefPtrWillBeMember<RotationRate> m_rotationRate;
     bool m_canProvideInterval;
     double m_interval;
 };