Diff
Modified: trunk/Source/WebCore/ChangeLog (99749 => 99750)
--- trunk/Source/WebCore/ChangeLog 2011-11-09 20:13:02 UTC (rev 99749)
+++ trunk/Source/WebCore/ChangeLog 2011-11-09 20:22:42 UTC (rev 99750)
@@ -1,3 +1,27 @@
+2011-11-09 Kentaro Hara <[email protected]>
+
+ Generate the HTMLAudioElement constructor using [NamedConstructor] IDL
+ https://bugs.webkit.org/show_bug.cgi?id=71924
+
+ Reviewed by Adam Barth.
+
+ This patch removes a custom constructor of HTMLAudioElement
+ and generates it using [NamedConstructor] IDL.
+
+ Tests: fast/js/custom-constructors.html
+ media/audio-constructor.html
+ media/audio-constructor-src.html
+ media/audio-constructor-preload.html
+ media/audio-controls-do-not-fade-out.html
+ media/audio-controls-rendering.html
+
+ * Target.pri: Removed V8HTMLAudioElementConstructor.{h,cpp}
+ * WebCore.gypi: Ditto.
+ * bindings/v8/custom/V8HTMLAudioElementConstructor.cpp: Removed.
+ * bindings/v8/custom/V8HTMLAudioElementConstructor.h: Removed.
+ * html/HTMLAudioElement.idl: Added [NamedConstructor] IDL.
+ * page/DOMWindow.idl: Removed [V8CustomConstructor] IDL.
+
2011-11-09 Antti Koivisto <[email protected]>
Eliminate CSSMutableValue
Modified: trunk/Source/WebCore/Target.pri (99749 => 99750)
--- trunk/Source/WebCore/Target.pri 2011-11-09 20:13:02 UTC (rev 99749)
+++ trunk/Source/WebCore/Target.pri 2011-11-09 20:22:42 UTC (rev 99750)
@@ -182,11 +182,6 @@
bindings/v8/custom/V8FileReaderCustom.cpp \
bindings/v8/custom/V8HTMLAllCollectionCustom.cpp
- contains(DEFINES, ENABLE_VIDEO=1) {
- SOURCES += \
- bindings/v8/custom/V8HTMLAudioElementConstructor.cpp
- }
-
SOURCES += \
bindings/v8/custom/V8HTMLCanvasElementCustom.cpp \
bindings/v8/custom/V8HTMLCollectionCustom.cpp \
@@ -1349,7 +1344,6 @@
HEADERS += \
bindings/v8/custom/V8CustomVoidCallback.h \
bindings/v8/custom/V8CustomXPathNSResolver.h \
- bindings/v8/custom/V8HTMLAudioElementConstructor.h \
bindings/v8/custom/V8HTMLImageElementConstructor.h \
bindings/v8/custom/V8HTMLSelectElementCustom.h \
bindings/v8/custom/V8MessagePortCustom.h \
Modified: trunk/Source/WebCore/WebCore.gypi (99749 => 99750)
--- trunk/Source/WebCore/WebCore.gypi 2011-11-09 20:13:02 UTC (rev 99749)
+++ trunk/Source/WebCore/WebCore.gypi 2011-11-09 20:22:42 UTC (rev 99750)
@@ -2186,8 +2186,6 @@
'bindings/v8/custom/V8Float64ArrayCustom.cpp',
'bindings/v8/custom/V8GeolocationCustom.cpp',
'bindings/v8/custom/V8HTMLAllCollectionCustom.cpp',
- 'bindings/v8/custom/V8HTMLAudioElementConstructor.cpp',
- 'bindings/v8/custom/V8HTMLAudioElementConstructor.h',
'bindings/v8/custom/V8HTMLCanvasElementCustom.cpp',
'bindings/v8/custom/V8HTMLCollectionCustom.cpp',
'bindings/v8/custom/V8HTMLDocumentCustom.cpp',
Deleted: trunk/Source/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp (99749 => 99750)
--- trunk/Source/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp 2011-11-09 20:13:02 UTC (rev 99749)
+++ trunk/Source/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp 2011-11-09 20:22:42 UTC (rev 99750)
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2009 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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(VIDEO)
-
-#include "V8HTMLAudioElementConstructor.h"
-
-#include "HTMLAudioElement.h"
-#include "Document.h"
-#include "Frame.h"
-#include "HTMLNames.h"
-#include "V8Binding.h"
-#include "V8Document.h"
-#include "V8HTMLAudioElement.h"
-#include "V8Proxy.h"
-
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-WrapperTypeInfo V8HTMLAudioElementConstructor::info = { V8HTMLAudioElementConstructor::GetTemplate, V8HTMLAudioElement::derefObject, V8HTMLAudioElement::toActiveDOMObject, 0 };
-
-static v8::Handle<v8::Value> v8HTMLAudioElementConstructorCallback(const v8::Arguments& args)
-{
- INC_STATS("DOM.HTMLAudioElement.Contructor");
-
- if (!args.IsConstructCall())
- return throwError("DOM object constructor cannot be called as a function.", V8Proxy::TypeError);
-
- if (ConstructorMode::current() == ConstructorMode::WrapExistingObject)
- return args.Holder();
-
- Frame* frame = V8Proxy::retrieveFrameForCurrentContext();
- if (!frame)
- return throwError("Audio constructor associated frame is unavailable", V8Proxy::ReferenceError);
-
- Document* document = frame->document();
- if (!document)
- return throwError("Audio constructor associated document is unavailable", V8Proxy::ReferenceError);
-
- // Make sure the document is added to the DOM Node map. Otherwise, the HTMLAudioElement instance
- // may end up being the only node in the map and get garbage-collected prematurely.
- toV8(document);
-
- String src;
- if (args.Length() > 0)
- src = ""
- RefPtr<HTMLAudioElement> audio = HTMLAudioElement::createForJSConstructor(document, src);
-
- V8DOMWrapper::setDOMWrapper(args.Holder(), &V8HTMLAudioElementConstructor::info, audio.get());
- audio->ref();
- V8DOMWrapper::setJSWrapperForActiveDOMObject(audio.get(), v8::Persistent<v8::Object>::New(args.Holder()));
- return args.Holder();
-}
-
-v8::Persistent<v8::FunctionTemplate> V8HTMLAudioElementConstructor::GetTemplate()
-{
- static v8::Persistent<v8::FunctionTemplate> cachedTemplate;
- if (!cachedTemplate.IsEmpty())
- return cachedTemplate;
-
- v8::HandleScope scope;
- v8::Local<v8::FunctionTemplate> result = v8::FunctionTemplate::New(v8HTMLAudioElementConstructorCallback);
-
- v8::Local<v8::ObjectTemplate> instance = result->InstanceTemplate();
- instance->SetInternalFieldCount(V8HTMLAudioElement::internalFieldCount);
- result->SetClassName(v8::String::New("HTMLAudioElement"));
- result->Inherit(V8HTMLAudioElement::GetTemplate());
-
- cachedTemplate = v8::Persistent<v8::FunctionTemplate>::New(result);
- return cachedTemplate;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(VIDEO)
Deleted: trunk/Source/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.h (99749 => 99750)
--- trunk/Source/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.h 2011-11-09 20:13:02 UTC (rev 99749)
+++ trunk/Source/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.h 2011-11-09 20:22:42 UTC (rev 99750)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2009 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#ifndef V8HTMLAudioElementConstructor_h
-#define V8HTMLAudioElementConstructor_h
-
-#if ENABLE(VIDEO)
-
-#include "WrapperTypeInfo.h"
-
-#include <v8.h>
-
-namespace WebCore {
-
-class V8HTMLAudioElementConstructor {
-public:
- static v8::Persistent<v8::FunctionTemplate> GetTemplate();
- static WrapperTypeInfo info;
-};
-
-}
-
-#endif // ENABLE(VIDEO)
-
-#endif // V8HTMLAudioElementConstructor_h
Modified: trunk/Source/WebCore/html/HTMLAudioElement.idl (99749 => 99750)
--- trunk/Source/WebCore/html/HTMLAudioElement.idl 2011-11-09 20:13:02 UTC (rev 99749)
+++ trunk/Source/WebCore/html/HTMLAudioElement.idl 2011-11-09 20:22:42 UTC (rev 99750)
@@ -26,8 +26,8 @@
module html {
interface [
ActiveDOMObject,
- Conditional=VIDEO
+ Conditional=VIDEO,
+ NamedConstructor=Audio(in [Optional=CallWithNullValue] DOMString src)
] HTMLAudioElement : HTMLMediaElement {
-
};
}
Modified: trunk/Source/WebCore/page/DOMWindow.idl (99749 => 99750)
--- trunk/Source/WebCore/page/DOMWindow.idl 2011-11-09 20:13:02 UTC (rev 99749)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2011-11-09 20:22:42 UTC (rev 99750)
@@ -627,7 +627,7 @@
attribute StorageConstructor Storage;
- attribute [JSCCustomGetter, CustomConstructor, Conditional=VIDEO, EnabledAtRuntime] HTMLAudioElementConstructorConstructor Audio; // Usable with the new operator
+ attribute [JSCCustomGetter, JSCustomConstructor, Conditional=VIDEO, EnabledAtRuntime] HTMLAudioElementConstructorConstructor Audio; // Usable with the new operator
attribute [Conditional=VIDEO, EnabledAtRuntime] HTMLAudioElementConstructor HTMLAudioElement;
attribute [Conditional=VIDEO, EnabledAtRuntime] HTMLMediaElementConstructor HTMLMediaElement;
attribute [Conditional=VIDEO, EnabledAtRuntime] HTMLVideoElementConstructor HTMLVideoElement;
