Diff
Modified: trunk/Source/WebCore/ChangeLog (145921 => 145922)
--- trunk/Source/WebCore/ChangeLog 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/ChangeLog 2013-03-15 18:10:30 UTC (rev 145922)
@@ -1,3 +1,21 @@
+2013-03-15 Andreas Kling <[email protected]>
+
+ [JSC] Remove custom WebAudio mark functions that we can generate instead.
+ <http://webkit.org/b/110976>
+
+ Reviewed by Eric Carlson.
+
+ Remove custom JSC mark functions for AudioContext and ScriptProcessorNode since they
+ are trivial to generate.
+
+ * Modules/webaudio/AudioContext.idl:
+ * Modules/webaudio/ScriptProcessorNode.idl:
+ * GNUmakefile.list.am:
+ * UseJSC.cmake:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSAudioContextCustom.cpp:
+ * bindings/js/JSScriptProcessorNodeCustom.cpp: Removed.
+
2013-03-15 Jer Noble <[email protected]>
Unreviewed build fix. Rename local variable which was colliding with class method.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (145921 => 145922)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-03-15 18:10:30 UTC (rev 145922)
@@ -2414,7 +2414,6 @@
Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp \
Source/WebCore/bindings/js/JSInjectedScriptManager.cpp \
Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp \
- Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp \
Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp \
Source/WebCore/bindings/js/JSLazyEventListener.cpp \
Source/WebCore/bindings/js/JSLazyEventListener.h \
Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.idl (145921 => 145922)
--- trunk/Source/WebCore/Modules/webaudio/AudioContext.idl 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.idl 2013-03-15 18:10:30 UTC (rev 145922)
@@ -28,7 +28,6 @@
ActiveDOMObject,
CustomConstructor,
ConstructorParameters=0,
- JSCustomMarkFunction,
EventTarget
] interface AudioContext {
// All rendered audio ultimately connects to destination, which represents the audio hardware.
Modified: trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl (145921 => 145922)
--- trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl 2013-03-15 18:10:30 UTC (rev 145922)
@@ -26,7 +26,7 @@
[
Conditional=WEB_AUDIO,
JSGenerateToJSObject,
- JSCustomMarkFunction,
+ JSGenerateToNativeObject,
EventTarget
] interface ScriptProcessorNode : AudioNode {
// Rendering callback
Modified: trunk/Source/WebCore/Target.pri (145921 => 145922)
--- trunk/Source/WebCore/Target.pri 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/Target.pri 2013-03-15 18:10:30 UTC (rev 145922)
@@ -3520,7 +3520,6 @@
bindings/js/JSDOMWindowWebAudioCustom.cpp \
bindings/js/JSOscillatorNodeCustom.cpp \
bindings/js/JSPannerNodeCustom.cpp \
- bindings/js/JSScriptProcessorNodeCustom.cpp \
Modules/webaudio/AsyncAudioDecoder.cpp \
Modules/webaudio/AudioBasicInspectorNode.cpp \
Modules/webaudio/AudioBasicProcessorNode.cpp \
Modified: trunk/Source/WebCore/UseJSC.cmake (145921 => 145922)
--- trunk/Source/WebCore/UseJSC.cmake 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/UseJSC.cmake 2013-03-15 18:10:30 UTC (rev 145922)
@@ -261,7 +261,6 @@
bindings/js/JSBiquadFilterNodeCustom.cpp
bindings/js/JSOscillatorNodeCustom.cpp
bindings/js/JSPannerNodeCustom.cpp
- bindings/js/JSScriptProcessorNodeCustom.cpp
)
endif ()
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (145921 => 145922)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-03-15 18:10:30 UTC (rev 145922)
@@ -6797,7 +6797,6 @@
FDEA6247152102FC00479DF0 /* JSWaveTable.h in Headers */ = {isa = PBXBuildFile; fileRef = FDEA6245152102FC00479DF0 /* JSWaveTable.h */; };
FDEAAAF312B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */; };
FDEAAAF412B02EE400DCF33B /* JSAudioContextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEAAAF012B02EE400DCF33B /* JSAudioContextCustom.cpp */; };
- FDEAAAFE12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */; };
FDF09DC81399B62200688E5B /* JSBiquadFilterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDF09DC61399B62200688E5B /* JSBiquadFilterNode.cpp */; };
FDF09DC91399B62200688E5B /* JSBiquadFilterNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDF09DC71399B62200688E5B /* JSBiquadFilterNode.h */; };
FDF6BAF8134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDF6BAF6134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp */; };
@@ -14610,7 +14609,6 @@
FDEA6245152102FC00479DF0 /* JSWaveTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWaveTable.h; sourceTree = "<group>"; };
FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBufferSourceNodeCustom.cpp; sourceTree = "<group>"; };
FDEAAAF012B02EE400DCF33B /* JSAudioContextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioContextCustom.cpp; sourceTree = "<group>"; };
- FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProcessorNodeCustom.cpp; sourceTree = "<group>"; };
FDF09DC61399B62200688E5B /* JSBiquadFilterNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBiquadFilterNode.cpp; sourceTree = "<group>"; };
FDF09DC71399B62200688E5B /* JSBiquadFilterNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBiquadFilterNode.h; sourceTree = "<group>"; };
FDF6BAF6134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOfflineAudioCompletionEvent.cpp; sourceTree = "<group>"; };
@@ -21314,7 +21312,6 @@
A85F22081430377D007CC884 /* JSPopStateEventCustom.cpp */,
E1AD12D51295D0BD00ACA989 /* JSProcessingInstructionCustom.cpp */,
4998AED313FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp */,
- FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */,
51DCE8010CAC9F1C00488358 /* JSSQLResultSetRowListCustom.cpp */,
1AD2316D0CD269E700C1F194 /* JSSQLTransactionCustom.cpp */,
B55D5AA71191325000BCC315 /* JSSQLTransactionSyncCustom.cpp */,
@@ -28657,7 +28654,6 @@
BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */,
BCEC01C20C274DDD009F4EC9 /* JSScreen.cpp in Sources */,
FDA15ECD12B03F61003A583A /* JSScriptProcessorNode.cpp in Sources */,
- FDEAAAFE12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp in Sources */,
9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
4A1E71A514E106AC00626F9D /* JSShadowRoot.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp (145921 => 145922)
--- trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp 2013-03-15 18:10:30 UTC (rev 145922)
@@ -41,16 +41,6 @@
namespace WebCore {
-void JSAudioContext::visitChildren(JSCell* cell, SlotVisitor& visitor)
-{
- JSAudioContext* thisObject = jsCast<JSAudioContext*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
- thisObject->m_impl->visitJSEventListeners(visitor);
-}
-
EncodedJSValue JSC_HOST_CALL JSAudioContextConstructor::constructJSAudioContext(ExecState* exec)
{
JSAudioContextConstructor* jsConstructor = jsCast<JSAudioContextConstructor*>(exec->callee());
Deleted: trunk/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp (145921 => 145922)
--- trunk/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp 2013-03-15 18:08:40 UTC (rev 145921)
+++ trunk/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp 2013-03-15 18:10:30 UTC (rev 145922)
@@ -1,49 +0,0 @@
-/*
- * 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 "ScriptProcessorNode.h"
-
-#include "JSScriptProcessorNode.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-void JSScriptProcessorNode::visitChildren(JSCell* cell, SlotVisitor& visitor)
-{
- JSScriptProcessorNode* thisObject = jsCast<JSScriptProcessorNode*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
- static_cast<ScriptProcessorNode*>(thisObject->impl())->visitJSEventListeners(visitor);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_AUDIO)
