[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 15:53:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c17fea57da3bfb33bcaf2491f3f1854cee774acf
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 04:53:34 2010 +0000
2010-11-15 Chris Rogers <crogers at google.com>
Reviewed by Kenneth Russell.
Add AudioNode custom bindings
https://bugs.webkit.org/show_bug.cgi?id=49119
No new tests since audio API is not yet implemented.
* bindings/js/JSAudioNodeCustom.cpp: Added.
(WebCore::JSAudioNode::connect):
(WebCore::JSAudioNode::disconnect):
* bindings/v8/custom/V8AudioNodeCustom.cpp: Added.
(WebCore::V8AudioNode::connectCallback):
(WebCore::V8AudioNode::disconnectCallback):
* webaudio/AudioNode.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72057 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 527354a..8eca34a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-15 Chris Rogers <crogers at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Add AudioNode custom bindings
+ https://bugs.webkit.org/show_bug.cgi?id=49119
+
+ No new tests since audio API is not yet implemented.
+
+ * bindings/js/JSAudioNodeCustom.cpp: Added.
+ (WebCore::JSAudioNode::connect):
+ (WebCore::JSAudioNode::disconnect):
+ * bindings/v8/custom/V8AudioNodeCustom.cpp: Added.
+ (WebCore::V8AudioNode::connectCallback):
+ (WebCore::V8AudioNode::disconnectCallback):
+ * webaudio/AudioNode.idl:
+
2010-11-15 Dave Hyatt <hyatt at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/bindings/js/JSAudioNodeCustom.cpp b/WebCore/bindings/js/JSAudioNodeCustom.cpp
new file mode 100644
index 0000000..67f33f2
--- /dev/null
+++ b/WebCore/bindings/js/JSAudioNodeCustom.cpp
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2010, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(WEB_AUDIO)
+
+#include "JSAudioNode.h"
+
+#include "AudioNode.h"
+#include <runtime/Error.h>
+
+namespace WebCore {
+
+JSC::JSValue JSAudioNode::connect(JSC::ExecState* exec)
+{
+ if (exec->argumentCount() < 1)
+ return throwError(exec, createSyntaxError(exec, "Not enough arguments"));
+
+ unsigned outputIndex = 0;
+ unsigned inputIndex = 0;
+
+ AudioNode* destinationNode = toAudioNode(exec->argument(0));
+ if (!destinationNode)
+ return throwError(exec, createSyntaxError(exec, "Invalid destination node"));
+
+ if (exec->argumentCount() > 1)
+ outputIndex = exec->argument(1).toInt32(exec);
+
+ if (exec->argumentCount() > 2)
+ inputIndex = exec->argument(2).toInt32(exec);
+
+ AudioNode* audioNode = static_cast<AudioNode*>(impl());
+ bool success = audioNode->connect(destinationNode, outputIndex, inputIndex);
+ if (!success)
+ return throwError(exec, createSyntaxError(exec, "Invalid index parameter"));
+
+ return JSC::jsUndefined();
+}
+
+JSC::JSValue JSAudioNode::disconnect(JSC::ExecState* exec)
+{
+ unsigned outputIndex = 0;
+ if (exec->argumentCount() > 0)
+ outputIndex = exec->argument(0).toInt32(exec);
+
+ AudioNode* audioNode = static_cast<AudioNode*>(impl());
+ audioNode->disconnect(outputIndex);
+ return JSC::jsUndefined();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
diff --git a/WebCore/bindings/v8/custom/V8AudioNodeCustom.cpp b/WebCore/bindings/v8/custom/V8AudioNodeCustom.cpp
new file mode 100644
index 0000000..924b2ce
--- /dev/null
+++ b/WebCore/bindings/v8/custom/V8AudioNodeCustom.cpp
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2010, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(WEB_AUDIO)
+
+#include "V8AudioNode.h"
+
+#include "AudioNode.h"
+#include "ExceptionCode.h"
+#include "NotImplemented.h"
+#include "V8Binding.h"
+#include "V8Proxy.h"
+
+namespace WebCore {
+
+v8::Handle<v8::Value> V8AudioNode::connectCallback(const v8::Arguments& args)
+{
+ if (args.Length() < 1)
+ return throwError("Not enough arguments", V8Proxy::SyntaxError);
+
+ AudioNode* destinationNode = toNative(args[0]->ToObject());
+ if (!destinationNode)
+ return throwError("Invalid destination node", V8Proxy::SyntaxError);
+
+ unsigned output = 0;
+ unsigned input = 0;
+ bool ok = false;
+ if (args.Length() > 1) {
+ output = toInt32(args[1], ok);
+ if (!ok)
+ return throwError("Invalid index parameters", V8Proxy::SyntaxError);
+ }
+
+ if (args.Length() > 2) {
+ input = toInt32(args[2], ok);
+ if (!ok)
+ return throwError("Invalid index parameters", V8Proxy::SyntaxError);
+ }
+
+ AudioNode* audioNode = toNative(args.Holder());
+ bool success = audioNode->connect(destinationNode, output, input);
+ if (!success)
+ return throwError("Invalid index parameter", V8Proxy::SyntaxError);
+
+ return v8::Undefined();
+}
+
+v8::Handle<v8::Value> V8AudioNode::disconnectCallback(const v8::Arguments& args)
+{
+ unsigned output = 0;
+ bool ok = false;
+ if (args.Length() > 0) {
+ output = toInt32(args[0], ok);
+ if (!ok)
+ return throwError("Invalid index parameters", V8Proxy::SyntaxError);
+ }
+
+ AudioNode* audioNode = toNative(args.Holder());
+ bool success = audioNode->disconnect(output);
+ if (!success)
+ return throwError("Invalid index parameter", V8Proxy::SyntaxError);
+
+ return v8::Undefined();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
diff --git a/WebCore/webaudio/AudioNode.idl b/WebCore/webaudio/AudioNode.idl
index dad5454..8d903e2 100644
--- a/WebCore/webaudio/AudioNode.idl
+++ b/WebCore/webaudio/AudioNode.idl
@@ -30,7 +30,10 @@ module audio {
readonly attribute unsigned long numberOfInputs;
readonly attribute unsigned long numberOfOutputs;
- [Custom] void connect(in AudioNode destination, in unsigned long output, in unsigned long input);
- [Custom] void disconnect(in unsigned long output);
+ [Custom] void connect(in AudioNode destination, in unsigned long output, in unsigned long input)
+ raises(DOMException);
+
+ [Custom] void disconnect(in unsigned long output)
+ raises(DOMException);
};
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list