| Index: third_party/WebKit/Source/modules/vr/VRPositionState.h
|
| diff --git a/third_party/WebKit/Source/modules/vr/VRPositionState.h b/third_party/WebKit/Source/modules/vr/VRPositionState.h
|
| index 787f97eb4dce041fea4f25780c05c473f044e3a3..5f7c289615cc7d8e17e1661d34a746783730ba4e 100644
|
| --- a/third_party/WebKit/Source/modules/vr/VRPositionState.h
|
| +++ b/third_party/WebKit/Source/modules/vr/VRPositionState.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef VRPositionState_h
|
| #define VRPositionState_h
|
|
|
| +#include "bindings/core/v8/ScriptValue.h"
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| -#include "core/dom/DOMPoint.h"
|
| #include "platform/heap/Handle.h"
|
| #include "public/platform/modules/vr/WebVR.h"
|
| #include "wtf/Forward.h"
|
| @@ -14,7 +14,7 @@
|
|
|
| namespace blink {
|
|
|
| -class VRPositionState final : public GarbageCollected<VRPositionState>, public ScriptWrappable {
|
| +class VRPositionState final : public GarbageCollectedFinalized<VRPositionState>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| static VRPositionState* create()
|
| @@ -23,12 +23,12 @@ public:
|
| }
|
|
|
| double timeStamp() const { return m_timeStamp; }
|
| - DOMPoint* orientation() const { return m_orientation; }
|
| - DOMPoint* position() const { return m_position; }
|
| - DOMPoint* angularVelocity() const { return m_angularVelocity; }
|
| - DOMPoint* linearVelocity() const { return m_linearVelocity; }
|
| - DOMPoint* angularAcceleration() const { return m_angularAcceleration; }
|
| - DOMPoint* linearAcceleration() const { return m_linearAcceleration; }
|
| + const ScriptValue& orientation() const { return m_orientation; }
|
| + const ScriptValue& position() const { return m_position; }
|
| + const ScriptValue& angularVelocity() const { return m_angularVelocity; }
|
| + const ScriptValue& linearVelocity() const { return m_linearVelocity; }
|
| + const ScriptValue& angularAcceleration() const { return m_angularAcceleration; }
|
| + const ScriptValue& linearAcceleration() const { return m_linearAcceleration; }
|
|
|
| void setState(const WebHMDSensorState&);
|
|
|
| @@ -38,12 +38,12 @@ private:
|
| VRPositionState();
|
|
|
| double m_timeStamp;
|
| - Member<DOMPoint> m_orientation;
|
| - Member<DOMPoint> m_position;
|
| - Member<DOMPoint> m_angularVelocity;
|
| - Member<DOMPoint> m_linearVelocity;
|
| - Member<DOMPoint> m_angularAcceleration;
|
| - Member<DOMPoint> m_linearAcceleration;
|
| + ScriptValue m_orientation;
|
| + ScriptValue m_position;
|
| + ScriptValue m_angularVelocity;
|
| + ScriptValue m_linearVelocity;
|
| + ScriptValue m_angularAcceleration;
|
| + ScriptValue m_linearAcceleration;
|
| };
|
|
|
| } // namespace blink
|
|
|