Changeset 146040 in webkit


Ignore:
Timestamp:
Mar 18, 2013 1:33:30 AM (11 years ago)
Author:
haraken@chromium.org
Message:

Unreviewed, rolling out r146033.
​http://trac.webkit.org/changeset/146033
​https://bugs.webkit.org/show_bug.cgi?id=112521

web audio tests are broken

Source/WebCore:

  • Modules/webaudio/AudioNode.cpp:

(WebCore::AudioNode::AudioNode):

  • Modules/webaudio/AudioNode.h:
  • Modules/webaudio/AudioScheduledSourceNode.h:
  • Modules/webaudio/ScriptProcessorNode.idl:

LayoutTests:

  • webaudio/javascriptaudionode-expected.txt:
  • webaudio/javascriptaudionode.html:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r146039 r146040  
     12013-03-18  Kentaro Hara  <haraken@chromium.org>
     2
     3        Unreviewed, rolling out r146033.
     4        http://trac.webkit.org/changeset/146033
     5        https://bugs.webkit.org/show_bug.cgi?id=112521
     6
     7        web audio tests are broken
     8
     9        * webaudio/javascriptaudionode-expected.txt:
     10        * webaudio/javascriptaudionode.html:
     11
    1122013-03-18  Anton Muhin  <antonm@chromium.org>
    213

  • trunk/LayoutTests/webaudio/javascriptaudionode-expected.txt

    r146033 r146040  
    1717PASS Successfully created ScriptProcessorNode with bufferSize = 16384.
    1818PASS onaudioprocess was called with correct data.
    19 PASS audioprocessWasCalled is true
    2019PASS successfullyParsed is true
    2120

  • trunk/LayoutTests/webaudio/javascriptaudionode.html

    r146033 r146040  
    7676}
    7777
    78 function performGCTest() {
    79     // now test that ScriptProcessorNodes are not garbage collected
    80     // if they are unreachable but connected to a running audio context.
    81     var context = new webkitOfflineAudioContext(2, renderLengthInFrames, sampleRate);
    82 
    83     window.audioprocessWasCalled = false;
    84 
    85     context.oncomplete = function () {
    86         shouldBeTrue('audioprocessWasCalled');
    87         finishJSTest();
    88     };
    89 
    90     // add the scriptprocessor and callback in a nested function to be sure they'll
    91     // be unreachable.
    92     (function() {
    93         var jsnode = context.createScriptProcessor(bufferSize, 0, 1);
    94         jsnode.onaudioprocess = function() {
    95             audioprocessWasCalled = true;
    96         };
    97         jsnode.connect(context.destination);
    98     })();
    99     gc();
    100     context.startRendering();
    101 }
    102 
    10378function runTest() {
    10479    if (window.testRunner) {
    … …  
    174149
    175150    bufferSource.noteOn(0);
    176     context.oncomplete = performGCTest;
     151    context.oncomplete = finishJSTest;
    177152    context.startRendering();
    178 
    179153}
    180154

  • trunk/Source/WebCore/ChangeLog

    r146038 r146040  
     12013-03-18  Kentaro Hara  <haraken@chromium.org>
     2
     3        Unreviewed, rolling out r146033.
     4        http://trac.webkit.org/changeset/146033
     5        https://bugs.webkit.org/show_bug.cgi?id=112521
     6
     7        web audio tests are broken
     8
     9        * Modules/webaudio/AudioNode.cpp:
     10        (WebCore::AudioNode::AudioNode):
     11        * Modules/webaudio/AudioNode.h:
     12        * Modules/webaudio/AudioScheduledSourceNode.h:
     13        * Modules/webaudio/ScriptProcessorNode.idl:
     14
    1152013-03-18  Dominic Cooney  <dominicc@chromium.org>
    216

  • trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp

    r146033 r146040  
    4646
    4747AudioNode::AudioNode(AudioContext* context, float sampleRate)
    48     : ActiveDOMObject(context->scriptExecutionContext(), this)
    49     , m_isInitialized(false)
     48    : m_isInitialized(false)
    5049    , m_nodeType(NodeTypeUnknown)
    5150    , m_context(context)
    … …  
    7776}
    7877
    79 bool AudioNode::hasPendingActivity() const
    80 {
    81     return !m_isDisabled && (m_connectionRefCount > 0);
    82 }
    83    
    8478void AudioNode::initialize()
    8579{

  • trunk/Source/WebCore/Modules/webaudio/AudioNode.h

    r146033 r146040  
    2626#define AudioNode_h
    2727
    28 #include "ActiveDOMObject.h"
    2928#include "AudioBus.h"
    3029#include <wtf/Forward.h>
    … …  
    5150// Most processing nodes such as filters will have one input and one output, although multiple inputs and outputs are possible.
    5251
    53 class AudioNode : public ActiveDOMObject {
     52class AudioNode {
    5453public:
    5554    enum { ProcessingSizeInFrames = 128 };
    … …  
    112111    // Called from context's audio thread.
    113112    virtual void reset() = 0;
    114    
    115     // ActiveDOMObject interface
    116     virtual bool hasPendingActivity() const OVERRIDE;
    117113
    118114    // No significant resources should be allocated until initialize() is called.

  • trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h

    r146033 r146040  
    5757    AudioScheduledSourceNode(AudioContext*, float sampleRate);
    5858
    59     // unhide the ActiveDOMObject signature
    60     using AudioSourceNode::stop;
    61    
    6259    // Scheduling.
    6360    void start(double when);

  • trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl

    r146033 r146040  
    2828    JSGenerateToJSObject,
    2929    JSGenerateToNativeObject,
    30     ActiveDOMObject,
    3130    EventTarget
    3231] interface ScriptProcessorNode : AudioNode {
Note: See TracChangeset for help on using the changeset viewer.