Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webaudio / OscillatorNode.h

diff --git a/src/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h b/src/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h
index 9f02d52..be18d7d 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h
+++ b/src/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h
@@ -52,7 +52,7 @@ public:
         CUSTOM = 4
     };
 
-    static PassRefPtr<OscillatorNode> create(AudioContext*, float sampleRate);
+    static PassRefPtrWillBeRawPtr<OscillatorNode> create(AudioContext*, float sampleRate);
 
     virtual ~OscillatorNode();
 
@@ -61,7 +61,6 @@ public:
 
     String type() const;
 
-    bool setType(unsigned); // Returns true on success.
     void setType(const String&);
 
     AudioParam* frequency() { return m_frequency.get(); }
@@ -69,9 +68,13 @@ public:
 
     void setPeriodicWave(PeriodicWave*);
 
+    virtual void trace(Visitor*) OVERRIDE;
+
 private:
     OscillatorNode(AudioContext*, float sampleRate);
 
+    bool setType(unsigned); // Returns true on success.
+
     // Returns true if there are sample-accurate timeline parameter changes.
     bool calculateSampleAccuratePhaseIncrements(size_t framesToProcess);
 
@@ -81,10 +84,10 @@ private:
     unsigned short m_type;
 
     // Frequency value in Hertz.
-    RefPtr<AudioParam> m_frequency;
+    RefPtrWillBeMember<AudioParam> m_frequency;
 
     // Detune value (deviating from the frequency) in Cents.
-    RefPtr<AudioParam> m_detune;
+    RefPtrWillBeMember<AudioParam> m_detune;
 
     bool m_firstRender;
 
@@ -99,7 +102,7 @@ private:
     AudioFloatArray m_phaseIncrements;
     AudioFloatArray m_detuneValues;
 
-    RefPtr<PeriodicWave> m_periodicWave;
+    RefPtrWillBeMember<PeriodicWave> m_periodicWave;
 };
 
 } // namespace WebCore