Changeset 144896 in webkit


Ignore:
Timestamp:
Mar 6, 2013, 1:16:28 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r144859.
​http://trac.webkit.org/changeset/144859
​https://bugs.webkit.org/show_bug.cgi?id=111519

Introduced a test that calls non-exist function on non-
Chromium ports and crash on Chromium (Requested by rniwa on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-03-06

Source/WebCore:

  • html/HTMLAudioElement.h:

(WebCore::HTMLAudioElement::hasPendingActivity):
(HTMLAudioElement):

  • html/HTMLAudioElement.idl:
  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::hasPendingActivity):

  • html/HTMLMediaElement.idl:

LayoutTests:

  • http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal-expected.txt: Removed.
  • http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal.html: Removed.
  • http/tests/misc/resources/delete-frame-during-readystatechange-frame-with-gc-after-video-removal.html: Removed.
Location:
trunk
Files:
3 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r144894 r144896  
     12013-03-06  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144859.
     4        http://trac.webkit.org/changeset/144859
     5        https://bugs.webkit.org/show_bug.cgi?id=111519
     6
     7        Introduced a test that calls non-exist function on non-
     8        Chromium ports and crash on Chromium (Requested by rniwa on
     9        #webkit).
     10
     11        * http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal-expected.txt: Removed.
     12        * http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal.html: Removed.
     13        * http/tests/misc/resources/delete-frame-during-readystatechange-frame-with-gc-after-video-removal.html: Removed.
     14
    1152013-03-06  Tony Chang  <tony@chromium.org>
    216

  • trunk/Source/WebCore/ChangeLog

    r144895 r144896  
     12013-03-06  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144859.
     4        http://trac.webkit.org/changeset/144859
     5        https://bugs.webkit.org/show_bug.cgi?id=111519
     6
     7        Introduced a test that calls non-exist function on non-
     8        Chromium ports and crash on Chromium (Requested by rniwa on
     9        #webkit).
     10
     11        * html/HTMLAudioElement.h:
     12        (WebCore::HTMLAudioElement::hasPendingActivity):
     13        (HTMLAudioElement):
     14        * html/HTMLAudioElement.idl:
     15        * html/HTMLMediaElement.cpp:
     16        (WebCore::HTMLMediaElement::hasPendingActivity):
     17        * html/HTMLMediaElement.idl:
     18
    1192013-03-06  Ilya Tikhonovsky  <loislo@chromium.org>
    220

  • trunk/Source/WebCore/html/HTMLAudioElement.h

    r144859 r144896  
    4040    static PassRefPtr<HTMLAudioElement> createForJSConstructor(Document*, const String& src);
    4141
     42    virtual bool hasPendingActivity() const { return isPlaying() || HTMLMediaElement::hasPendingActivity(); }
     43
    4244    virtual bool isActiveNode() const { return true; }
    4345

  • trunk/Source/WebCore/html/HTMLAudioElement.idl

    r144859 r144896  
    2525
    2626[
     27    ActiveDOMObject,
    2728    Conditional=VIDEO,
    2829    NamedConstructor=Audio(in [Optional=DefaultIsNullString] DOMString src)

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r144859 r144896  
    39583958bool HTMLMediaElement::hasPendingActivity() const
    39593959{
    3960     return (hasAudio() && isPlaying()) || m_asyncEventQueue->hasPendingEvents();
     3960    return m_asyncEventQueue->hasPendingEvents();
    39613961}
    39623962

  • trunk/Source/WebCore/html/HTMLMediaElement.idl

    r144859 r144896  
    2626[
    2727    Conditional=VIDEO,
    28     JSGenerateToNativeObject,
    29     ActiveDOMObject
     28    JSGenerateToNativeObject
    3029] interface HTMLMediaElement : HTMLElement {
    3130
Note: See TracChangeset for help on using the changeset viewer.