Layout Test media/track/track-delete-during-setup.html is hitting an ASSERT_NOT_REACHED

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

Reviewed by Antti Koivisto.

Source/WebCore:

No new tests, already tested by media/track/track-delete-during-setup.html.

* html/HTMLTrackElement.cpp:
(WebCore::HTMLTrackElement::insertedIntoDocument): Don't notify the media element until/unless
the track element is inserted into the document.
* html/HTMLTrackElement.h:

LayoutTests:

* platform/chromium/test_expectations.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114256 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c2849ac..3137a7d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Layout Test media/track/track-delete-during-setup.html is hitting an ASSERT_NOT_REACHED
+        https://bugs.webkit.org/show_bug.cgi?id=82269
+
+        Reviewed by Antti Koivisto.
+
+        * platform/chromium/test_expectations.txt:
+
 2012-04-16  Dominik Röttsches  <dominik.rottsches@linux.intel.com>
 
         [EFL][DRT] Create baselines for CSS cases related to Ahem font

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 0fe016d..c59cda5 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3664,8 +3664,6 @@ BUGCR120356 : fast/regex/unicodeCaseInsensitive.html = TEXT
 
 BUGWK82300 SNOWLEOPARD : compositing/images/direct-pdf-image.html = IMAGE
 
-BUGWK82269 DEBUG : media/track/track-delete-during-setup.html = CRASH
-
 // this test appears to consistently fail during the main run but usually passes on a retry.
 BUGWK82404 : plugins/netscape-dom-access-and-reload.html = PASS TEXT
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7d97b98..e306c04 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2012-04-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Layout Test media/track/track-delete-during-setup.html is hitting an ASSERT_NOT_REACHED
+        https://bugs.webkit.org/show_bug.cgi?id=82269
+
+        Reviewed by Antti Koivisto.
+
+        No new tests, already tested by media/track/track-delete-during-setup.html.
+
+        * html/HTMLTrackElement.cpp:
+        (WebCore::HTMLTrackElement::insertedIntoDocument): Don't notify the media element until/unless
+        the track element is inserted into the document.
+        * html/HTMLTrackElement.h:
+
 2012-04-16  Yael Aharon  <yael.aharon@nokia.com>
 
         [Qt][WK2] Fixed elements position is wrong after zooming.

diff --git a/Source/WebCore/html/HTMLTrackElement.cpp b/Source/WebCore/html/HTMLTrackElement.cpp
index f80ceea..f2308a7 100644 (file)
--- a/Source/WebCore/html/HTMLTrackElement.cpp
+++ b/Source/WebCore/html/HTMLTrackElement.cpp
@@ -72,9 +72,9 @@ PassRefPtr<HTMLTrackElement> HTMLTrackElement::create(const QualifiedName& tagNa
     return adoptRef(new HTMLTrackElement(tagName, document));
 }
 
-void HTMLTrackElement::insertedIntoTree(bool deep)
+void HTMLTrackElement::insertedIntoDocument()
 {
-    HTMLElement::insertedIntoTree(deep);
+    HTMLElement::insertedIntoDocument();
 
     if (HTMLMediaElement* parent = mediaElement())
         parent->didAddTrack(this);

diff --git a/Source/WebCore/html/HTMLTrackElement.h b/Source/WebCore/html/HTMLTrackElement.h
index e2a55f3..1eab873 100644 (file)
--- a/Source/WebCore/html/HTMLTrackElement.h
+++ b/Source/WebCore/html/HTMLTrackElement.h
@@ -77,7 +77,7 @@ private:
 
     virtual void parseAttribute(Attribute*) OVERRIDE;
 
-    virtual void insertedIntoTree(bool) OVERRIDE;
+    virtual void insertedIntoDocument() OVERRIDE;
     virtual void willRemove() OVERRIDE;
     virtual bool isURLAttribute(Attribute*) const;