ChangeLog

2011-09-27  Eugene Nalimov  <enal@chromium.org>

        Playing HTMLAudioElement can be garbage collected

        https://bugs.webkit.org/show_bug.cgi?id=66878

        Reviewed by NOBODY (OOPS!).

        Fix consists of 2 parts:

        (a) make HTMLAudioElement an 'active' one, meaning that it cannot be

        garbage collected if it has panding activity

        (b) fix v8 bindings bug that was in the code forever, event listener

        could be garbage collected even if object it attached to is still

        alive, resulting in the loss of events.

        Submitting both fixes together because without 2nd fix I could not

        programmatically test 1st fix -- test has to depend on the events.

        Test: media/audio-garbage-collect.html

        * bindings/scripts/CodeGeneratorV8.pm:

        (GenerateEventListenerCallback):

        (IsActiveDomType):

        * bindings/v8/custom/V8HTMLAudioElementConstructor.cpp:

        (WebCore::v8HTMLAudioElementConstructorCallback):

        * html/HTMLAudioElement.h:

        (WebCore::HTMLAudioElement::hasPendingActivity):

        * html/HTMLMediaElement.h:

2011-10-11  Pavel Feldman  <pfeldman@google.com>

        Web Inspector: make Extensions component compile.

97152

Source/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp

namespace WebCore {

50 WrapperTypeInfo V8HTMLAudioElementConstructor::info = { V8HTMLAudioElementConstructor::GetTemplate, 0~~, 0~~, 0 };

50WrapperTypeInfo V8HTMLAudioElementConstructor::info = { V8HTMLAudioElementConstructor::GetTemplate, V8HTMLAudioElement::derefObject, V8HTMLAudioElement::toActiveDOMObject, 0 };

static v8::Handle<v8::Value> v8HTMLAudioElementConstructorCallback(const v8::Arguments& args)

{

@@static v8::Handle<v8::Value> v8HTMLAudio

    // may end up being the only node in the map and get garbage-collected prematurely.

    toV8(document);

71

    String src;

    if (args.Length() > 0)

        src = toWebCoreString(args[0]);

@@static v8::Handle<v8::Value> v8HTMLAudio

    V8DOMWrapper::setDOMWrapper(args.Holder(), &V8HTMLAudioElementConstructor::info, audio.get());

    audio->ref();

79 V8DOMWrapper::setJSWrapperForDOM~~Nod~~e(audio.get(), v8::Persistent<v8::Object>::New(args.Holder()));

78 V8DOMWrapper::setJSWrapperForActiveDOMObject(audio.get(), v8::Persistent<v8::Object>::New(args.Holder()));

    return args.Holder();

}

97152

Source/WebCore/html/HTMLAudioElement.h

@@public:

    static PassRefPtr<HTMLAudioElement> create(const QualifiedName&, Document*);

    static PassRefPtr<HTMLAudioElement> createForJSConstructor(Document*, const String& src);

43 virtual bool hasPendingActivity() const { return isPlaying() || HTMLMediaElement::hasPendingActivity(); }

44

private:

    HTMLAudioElement(const QualifiedName&, Document*);

97152

Source/WebCore/html/HTMLAudioElement.idl

module html {

    interface [

28 ActiveDOMObject,

        Conditional=VIDEO

    ] HTMLAudioElement : HTMLMediaElement {

97152

Source/WebCore/html/HTMLMediaElement.h

@@class Widget;

// But it can't be until the Chromium WebMediaPlayerClientImpl class is fixed so it

// no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement.

61 class HTMLMediaElement : public HTMLElement, public MediaPlayerClient, private MediaCanStartListener, pr~~ivate~~ ActiveDOMObject {

61class HTMLMediaElement : public HTMLElement, public MediaPlayerClient, private MediaCanStartListener, public ActiveDOMObject {

public:

    MediaPlayer* player() const { return m_player.get(); }

@@public:

    bool isPlaying() const { return m_playing; }

208 virtual bool hasPendingActivity() const;

209

#if ENABLE(WEB_AUDIO)

    MediaElementAudioSourceNode* audioSourceNode() { return m_audioSourceNode; }

    void setAudioSourceNode(MediaElementAudioSourceNode*);

@@private:

    virtual void suspend(ReasonForSuspension);

    virtual void resume();

    virtual void stop();

271 virtual bool hasPendingActivity() const;

    

    virtual void mediaVolumeDidChange();

97152

LayoutTests/ChangeLog

2011-09-27  Eugene Nalimov  <enal@chromium.org>

        Playing HTMLAudioElement can be garbage collected

        https://bugs.webkit.org/show_bug.cgi?id=66878

        Reviewed by NOBODY (OOPS!).

        Added regression test that plays short audio (~1 second) several times

        in a row and causes garbage collector in parallel. Test should play

        audio stream specified number of times and signal 'ended' event.

        * media/audio-garbage-collect-expected.txt: Added.

        * media/audio-garbage-collect.html: Added.

        * media/content/click2.wav: Added.

2011-10-05  Pavel Podivilov  <podivilov@chromium.org>

        Web Inspector: implement CompilerSourceMappingProvider.

97152

LayoutTests/fast/xpath/xpath-result-eventlistener-crash.html

@@function allocate() {

    // Fill the heap with event listeners...

    var a = []

29 for (var i = 0; i < 5000; ++i)

29 for (var i = 0; i < 2000; ++i)

        a[a.length] = function() { };

    // ...followed by a DOM node wrapper

97152

LayoutTests/media/audio-garbage-collect-expected.txt

Tests that we don't garbage collect playing audio object or event listener.

According to http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html,

"4.8.10.8 Playing the media resource",

"Media elements must not stop playing just because all references to them have been removed; only once a media element is in a state where no further audio could ever be played by that element may the element be garbage collected."

(see https://bugs.webkit.org/show_bug.cgi?id=66878 and http://crbug.com/62604 for more details).

PASS

0

LayoutTests/media/audio-garbage-collect.html

<!DOCTYPE HTML>

<html>

<body>

<p>Tests that we don't garbage collect playing audio object or event listener.</p>

<p>According to http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html,<br />

"4.8.10.8 Playing the media resource",<br />

"Media elements must not stop playing just because all references to them have

been removed; only once a media element is in a state where no further audio

could ever be played by that element may the element be garbage collected."<br /><br />

(see https://bugs.webkit.org/show_bug.cgi?id=66878 and http://crbug.com/62604 for more details).</p>

<p id="result">

    FAIL: Test either still running or stopped prematurely.

</p>

<script src=media-file.js></script>

<script src=video-test.js></script>

<script type="text/javascript">

var num_players = 4;

var play_times = 5;

var a;

var num_played;

var total_played = 0;

function forceGC() {

  if (window.GCController)

    return GCController.collect();

  // Force garbage collection

  for (var ndx = 0; ndx < 99000; ndx ++)

    var str = new String("1234");

}

function finish() {

  document.getElementById("result").innerText = "PASS";

  if (window.layoutTestController) {

    layoutTestController.notifyDone();

  }

}

function start() {

  num_played = 0;

  var audioFile = findMediaFile("audio", "content/click2");

  a = new Audio(audioFile);

  a.addEventListener('ended', function() {

    num_played ++;

    if (num_played < play_times) {

      a.currentTime = 0;

      a.play();

      if (num_played == play_times - 1) {

        a = null;

        forceGC();

      }

    } else {

      total_played ++;

      if (total_played < num_players)

        start();

      else

        finish();

    }

  });

  a.addEventListener('canplaythrough', function() {

    a.play();

  });

}

start();

</script>

</body>

</html>

0

LayoutTests/media/content/click2.wav

Binary file, nothing to see here