[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:36:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b2582c5bcdbdac6d97aa48ca52dde0ab4016e799
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 11:48:55 2010 +0000
2010-11-09 Chris Rogers <crogers at google.com>
Reviewed by Kenneth Russell.
Add custom bindings for AudioContext
https://bugs.webkit.org/show_bug.cgi?id=49115
No new tests since audio API is not yet implemented.
* bindings/js/JSAudioContextCustom.cpp: Added.
(WebCore::JSAudioContextConstructor::constructJSAudioContext):
* bindings/v8/custom/V8AudioContextCustom.cpp: Added.
(WebCore::V8AudioContext::constructorCallback):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71619 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b671798..ab8287a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-09 Chris Rogers <crogers at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Add custom bindings for AudioContext
+ https://bugs.webkit.org/show_bug.cgi?id=49115
+
+ No new tests since audio API is not yet implemented.
+
+ * bindings/js/JSAudioContextCustom.cpp: Added.
+ (WebCore::JSAudioContextConstructor::constructJSAudioContext):
+ * bindings/v8/custom/V8AudioContextCustom.cpp: Added.
+ (WebCore::V8AudioContext::constructorCallback):
+
2010-11-09 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/bindings/js/JSAudioContextCustom.cpp b/WebCore/bindings/js/JSAudioContextCustom.cpp
new file mode 100644
index 0000000..04644bc
--- /dev/null
+++ b/WebCore/bindings/js/JSAudioContextCustom.cpp
@@ -0,0 +1,57 @@
+/*
+ * 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 "AudioContext.h"
+
+#include "JSAudioContext.h"
+#include <runtime/Error.h>
+
+namespace WebCore {
+
+JSC::EncodedJSValue JSC_HOST_CALL JSAudioContextConstructor::constructJSAudioContext(JSC::ExecState* exec)
+{
+ JSAudioContextConstructor* jsConstructor = static_cast<JSAudioContextConstructor*>(exec->callee());
+ if (!jsConstructor)
+ return throwError(exec, createReferenceError(exec, "AudioContext constructor callee is unavailable"));
+
+ ScriptExecutionContext* scriptExecutionContext = jsConstructor->scriptExecutionContext();
+ if (!scriptExecutionContext)
+ return throwError(exec, createReferenceError(exec, "AudioContext constructor script execution context is unavailable"));
+
+ if (!scriptExecutionContext->isDocument())
+ return throwError(exec, createReferenceError(exec, "AudioContext constructor called in a script execution context which is not a document"));
+
+ Document* document = static_cast<Document*>(scriptExecutionContext);
+
+ RefPtr<AudioContext> context = AudioContext::create(document);
+ return JSC::JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(), context.get())));
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
diff --git a/WebCore/bindings/v8/custom/V8AudioContextCustom.cpp b/WebCore/bindings/v8/custom/V8AudioContextCustom.cpp
new file mode 100644
index 0000000..e1a1ba4
--- /dev/null
+++ b/WebCore/bindings/v8/custom/V8AudioContextCustom.cpp
@@ -0,0 +1,60 @@
+/*
+ * 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 "V8AudioContext.h"
+
+#include "AudioContext.h"
+#include "Frame.h"
+#include "V8Proxy.h"
+
+namespace WebCore {
+
+v8::Handle<v8::Value> V8AudioContext::constructorCallback(const v8::Arguments& args)
+{
+ INC_STATS("DOM.AudioContext.Contructor");
+
+ Frame* frame = V8Proxy::retrieveFrameForCurrentContext();
+ if (!frame)
+ return throwError("AudioContext constructor associated frame is unavailable", V8Proxy::ReferenceError);
+
+ Document* document = frame->document();
+ if (!document)
+ return throwError("AudioContext constructor associated document is unavailable", V8Proxy::ReferenceError);
+
+ RefPtr<AudioContext> audioContext = AudioContext::create(document);
+
+ // Transform the holder into a wrapper object for the audio context.
+ V8DOMWrapper::setDOMWrapper(args.Holder(), &info, audioContext.get());
+ audioContext->ref();
+
+ return args.Holder();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list