[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
crogers at google.com
crogers at google.com
Wed Dec 22 13:56:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4922e82db6743cef02911ccb06e412c893c1195e
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 30 06:49:36 2010 +0000
2010-09-29 Chris Rogers <crogers at google.com>
Reviewed by Kenneth Russell.
Put default initialize() and uninitialize() methods in AudioNode
https://bugs.webkit.org/show_bug.cgi?id=46767
No new tests since audio API is not yet implemented.
* webaudio/AudioNode.cpp:
(WebCore::AudioNode::initialize):
(WebCore::AudioNode::uninitialize):
* webaudio/AudioNode.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68757 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index be4d3ba..fc72ccc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-29 Chris Rogers <crogers at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Put default initialize() and uninitialize() methods in AudioNode
+ https://bugs.webkit.org/show_bug.cgi?id=46767
+
+ No new tests since audio API is not yet implemented.
+
+ * webaudio/AudioNode.cpp:
+ (WebCore::AudioNode::initialize):
+ (WebCore::AudioNode::uninitialize):
+ * webaudio/AudioNode.h:
+
2010-09-29 Kent Tamura <tkent at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/webaudio/AudioNode.cpp b/WebCore/webaudio/AudioNode.cpp
index 497ac95..9335c10 100644
--- a/WebCore/webaudio/AudioNode.cpp
+++ b/WebCore/webaudio/AudioNode.cpp
@@ -67,6 +67,16 @@ AudioNode::~AudioNode()
#endif
}
+void AudioNode::initialize()
+{
+ m_isInitialized = true;
+}
+
+void AudioNode::uninitialize()
+{
+ m_isInitialized = false;
+}
+
void AudioNode::setType(NodeType type)
{
m_type = type;
diff --git a/WebCore/webaudio/AudioNode.h b/WebCore/webaudio/AudioNode.h
index b697457..52f886d 100644
--- a/WebCore/webaudio/AudioNode.h
+++ b/WebCore/webaudio/AudioNode.h
@@ -100,8 +100,8 @@ public:
// No significant resources should be allocated until initialize() is called.
// Processing may not occur until a node is initialized.
- virtual void initialize() = 0;
- virtual void uninitialize() = 0;
+ virtual void initialize();
+ virtual void uninitialize();
bool isInitialized() const { return m_isInitialized; }
void lazyInitialize();
@@ -144,9 +144,8 @@ protected:
// Called from context's audio thread.
virtual void pullInputs(size_t framesToProcess);
- bool m_isInitialized;
-
private:
+ volatile bool m_isInitialized;
NodeType m_type;
RefPtr<AudioContext> m_context;
double m_sampleRate;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list