Diff
Modified: trunk/LayoutTests/ChangeLog (144895 => 144896)
--- trunk/LayoutTests/ChangeLog 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/LayoutTests/ChangeLog 2013-03-06 09:16:28 UTC (rev 144896)
@@ -1,3 +1,17 @@
+2013-03-06 Sheriff Bot <webkit.review....@gmail.com>
+
+ 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).
+
+ * 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.
+
2013-03-06 Tony Chang <t...@chromium.org>
Crash during middle mouse click when page is removed
Deleted: trunk/LayoutTests/http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal-expected.txt (144895 => 144896)
--- trunk/LayoutTests/http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal-expected.txt 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/LayoutTests/http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal-expected.txt 2013-03-06 09:16:28 UTC (rev 144896)
@@ -1 +0,0 @@
-Test deleting a subframe from within its readystatechange event and garbage collecting right after removing the video element from the document. We pass if we don't crash.
Deleted: trunk/LayoutTests/http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal.html (144895 => 144896)
--- trunk/LayoutTests/http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal.html 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/LayoutTests/http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal.html 2013-03-06 09:16:28 UTC (rev 144896)
@@ -1,15 +0,0 @@
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function r()
-{
- document.body.removeChild(document.getElementById("f"));
- setTimeout(function() { testRunner.notifyDone();}, 0);
-}
-</script>
-Test deleting a subframe from within its readystatechange event and garbage collecting right after removing the video element from the document.
-We pass if we don't crash.
-<iframe id="f" src=""
Deleted: trunk/LayoutTests/http/tests/misc/resources/delete-frame-during-readystatechange-frame-with-gc-after-video-removal.html (144895 => 144896)
--- trunk/LayoutTests/http/tests/misc/resources/delete-frame-during-readystatechange-frame-with-gc-after-video-removal.html 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/LayoutTests/http/tests/misc/resources/delete-frame-during-readystatechange-frame-with-gc-after-video-removal.html 2013-03-06 09:16:28 UTC (rev 144896)
@@ -1,22 +0,0 @@
-<html>
-<head>
-<script>
-i = 0;
-document.addEventListener('readystatechange', function() {
- if (i == 1)
- parent.r();
- i++;
-});
-
-window.addEventListener('DOMContentLoaded', function() {
- document.getElementById("v").load();
- document.body.removeChild(document.getElementById("v"));
- window.gc();
-});
-
-</script>
-</head>
-<body>
-<video id=v src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (144895 => 144896)
--- trunk/Source/WebCore/ChangeLog 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/Source/WebCore/ChangeLog 2013-03-06 09:16:28 UTC (rev 144896)
@@ -1,3 +1,21 @@
+2013-03-06 Sheriff Bot <webkit.review....@gmail.com>
+
+ 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).
+
+ * html/HTMLAudioElement.h:
+ (WebCore::HTMLAudioElement::hasPendingActivity):
+ (HTMLAudioElement):
+ * html/HTMLAudioElement.idl:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::hasPendingActivity):
+ * html/HTMLMediaElement.idl:
+
2013-03-06 Ilya Tikhonovsky <loi...@chromium.org>
Web Inspector: Could not open Profiles panel.
Modified: trunk/Source/WebCore/html/HTMLAudioElement.h (144895 => 144896)
--- trunk/Source/WebCore/html/HTMLAudioElement.h 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/Source/WebCore/html/HTMLAudioElement.h 2013-03-06 09:16:28 UTC (rev 144896)
@@ -39,6 +39,8 @@
static PassRefPtr<HTMLAudioElement> create(const QualifiedName&, Document*, bool);
static PassRefPtr<HTMLAudioElement> createForJSConstructor(Document*, const String& src);
+ virtual bool hasPendingActivity() const { return isPlaying() || HTMLMediaElement::hasPendingActivity(); }
+
virtual bool isActiveNode() const { return true; }
private:
Modified: trunk/Source/WebCore/html/HTMLAudioElement.idl (144895 => 144896)
--- trunk/Source/WebCore/html/HTMLAudioElement.idl 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/Source/WebCore/html/HTMLAudioElement.idl 2013-03-06 09:16:28 UTC (rev 144896)
@@ -24,6 +24,7 @@
*/
[
+ ActiveDOMObject,
Conditional=VIDEO,
NamedConstructor=Audio(in [Optional=DefaultIsNullString] DOMString src)
] interface HTMLAudioElement : HTMLMediaElement {
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (144895 => 144896)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-03-06 09:16:28 UTC (rev 144896)
@@ -3957,7 +3957,7 @@
bool HTMLMediaElement::hasPendingActivity() const
{
- return (hasAudio() && isPlaying()) || m_asyncEventQueue->hasPendingEvents();
+ return m_asyncEventQueue->hasPendingEvents();
}
void HTMLMediaElement::mediaVolumeDidChange()
Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (144895 => 144896)
--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2013-03-06 08:59:40 UTC (rev 144895)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2013-03-06 09:16:28 UTC (rev 144896)
@@ -25,8 +25,7 @@
[
Conditional=VIDEO,
- JSGenerateToNativeObject,
- ActiveDOMObject
+ JSGenerateToNativeObject
] interface HTMLMediaElement : HTMLElement {
// error state
