From 4b0207454ef0530b31b465877456c86af7126c78 Mon Sep 17 00:00:00 2001 From: "akling@apple.com" Date: Fri, 15 Mar 2013 18:10:30 +0000 Subject: [PATCH] [CherryPick] [JSC] Remove custom WebAudio mark functions that we can generate instead. [Title] [CherryPick] [JSC] Remove custom WebAudio mark functions that we can generate instead. [Issues] N/A [Problem] WebAudio API Spec update [Solution] Cherry picked. [Cherry-Picker] Praveen R Jadhav [JSC] Remove custom WebAudio mark functions that we can generate instead. 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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145922 268f45cc-cd09-0410-ab3c-d52691b4dbfc Conflicts: Source/WebCore/ChangeLog Source/WebCore/GNUmakefile.list.am Source/WebCore/Modules/webaudio/AudioContext.idl Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl Source/WebCore/WebCore.xcodeproj/project.pbxproj Change-Id: Ibd2e5227eb150e696182c5b042e95b3690b4f20d --- Source/WebCore/GNUmakefile.list.am | 1 - Source/WebCore/Modules/webaudio/AudioContext.idl | 1 - .../Modules/webaudio/ScriptProcessorNode.idl | 2 +- Source/WebCore/Target.pri | 1 - Source/WebCore/UseJSC.cmake | 1 - Source/WebCore/WebCore.xcodeproj/project.pbxproj | 2 - .../WebCore/bindings/js/JSAudioContextCustom.cpp | 10 ----- .../bindings/js/JSScriptProcessorNodeCustom.cpp | 49 ---------------------- 8 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 2763776..5cf3d06 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -1636,7 +1636,6 @@ webcore_sources += \ Source/WebCore/bindings/js/JSInt16ArrayCustom.cpp \ Source/WebCore/bindings/js/JSInt32ArrayCustom.cpp \ Source/WebCore/bindings/js/JSInt8ArrayCustom.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 \ diff --git a/Source/WebCore/Modules/webaudio/AudioContext.idl b/Source/WebCore/Modules/webaudio/AudioContext.idl index 1082ae7..7d889d0 100644 --- a/Source/WebCore/Modules/webaudio/AudioContext.idl +++ b/Source/WebCore/Modules/webaudio/AudioContext.idl @@ -29,7 +29,6 @@ module webaudio { ActiveDOMObject, CustomConstructor, ConstructorParameters=0, - JSCustomMarkFunction, EventTarget ] AudioContext { // All rendered audio ultimately connects to destination, which represents the audio hardware. diff --git a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl index f0c59c5..20bfc8b 100644 --- a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl +++ b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl @@ -27,7 +27,7 @@ module audio { interface [ Conditional=WEB_AUDIO, JSGenerateToJSObject, - JSCustomMarkFunction, + JSGenerateToNativeObject, EventTarget ] ScriptProcessorNode : AudioNode { // Rendering callback diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index 56db360..d4644cf 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -3283,7 +3283,6 @@ enable?(WEB_AUDIO) { 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 \ diff --git a/Source/WebCore/UseJSC.cmake b/Source/WebCore/UseJSC.cmake index 5eb8df5..7bab607 100644 --- a/Source/WebCore/UseJSC.cmake +++ b/Source/WebCore/UseJSC.cmake @@ -304,7 +304,6 @@ IF (ENABLE_WEB_AUDIO) bindings/js/JSBiquadFilterNodeCustom.cpp bindings/js/JSOscillatorNodeCustom.cpp bindings/js/JSPannerNodeCustom.cpp - bindings/js/JSScriptProcessorNodeCustom.cpp ) ENDIF () diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index b56984e..bbc0069 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -20311,7 +20311,6 @@ A85F22081430377D007CC884 /* JSPopStateEventCustom.cpp */, E1AD12D51295D0BD00ACA989 /* JSProcessingInstructionCustom.cpp */, 4998AED313FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp */, - FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */, 9FA37EE61172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp */, 51DCE8010CAC9F1C00488358 /* JSSQLResultSetRowListCustom.cpp */, 1AD2316D0CD269E700C1F194 /* JSSQLTransactionCustom.cpp */, @@ -27267,7 +27266,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 */, 9FA37EE71172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp in Sources */, diff --git a/Source/WebCore/bindings/js/JSAudioContextCustom.cpp b/Source/WebCore/bindings/js/JSAudioContextCustom.cpp index 8a3fae7..46cd4cc 100644 --- a/Source/WebCore/bindings/js/JSAudioContextCustom.cpp +++ b/Source/WebCore/bindings/js/JSAudioContextCustom.cpp @@ -41,16 +41,6 @@ using namespace JSC; namespace WebCore { -void JSAudioContext::visitChildren(JSCell* cell, SlotVisitor& visitor) -{ - JSAudioContext* thisObject = jsCast(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(exec->callee()); diff --git a/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp b/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp deleted file mode 100644 index 7ea27e7c..0000000 --- a/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp +++ /dev/null @@ -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(cell); - ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info); - COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag); - ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren()); - Base::visitChildren(thisObject, visitor); - static_cast(thisObject->impl())->visitJSEventListeners(visitor); -} - -} // namespace WebCore - -#endif // ENABLE(WEB_AUDIO) -- 2.7.4