Title: [114256] trunk
- Revision
- 114256
- Author
- [email protected]
- Date
- 2012-04-16 08:13:25 -0700 (Mon, 16 Apr 2012)
Log Message
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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (114255 => 114256)
--- trunk/LayoutTests/ChangeLog 2012-04-16 15:10:08 UTC (rev 114255)
+++ trunk/LayoutTests/ChangeLog 2012-04-16 15:13:25 UTC (rev 114256)
@@ -1,3 +1,12 @@
+2012-04-16 Eric Carlson <[email protected]>
+
+ 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 <[email protected]>
[EFL][DRT] Create baselines for CSS cases related to Ahem font
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (114255 => 114256)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-16 15:10:08 UTC (rev 114255)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-16 15:13:25 UTC (rev 114256)
@@ -3664,8 +3664,6 @@
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
Modified: trunk/Source/WebCore/ChangeLog (114255 => 114256)
--- trunk/Source/WebCore/ChangeLog 2012-04-16 15:10:08 UTC (rev 114255)
+++ trunk/Source/WebCore/ChangeLog 2012-04-16 15:13:25 UTC (rev 114256)
@@ -1,3 +1,17 @@
+2012-04-16 Eric Carlson <[email protected]>
+
+ 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 <[email protected]>
[Qt][WK2] Fixed elements position is wrong after zooming.
Modified: trunk/Source/WebCore/html/HTMLTrackElement.cpp (114255 => 114256)
--- trunk/Source/WebCore/html/HTMLTrackElement.cpp 2012-04-16 15:10:08 UTC (rev 114255)
+++ trunk/Source/WebCore/html/HTMLTrackElement.cpp 2012-04-16 15:13:25 UTC (rev 114256)
@@ -72,9 +72,9 @@
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);
Modified: trunk/Source/WebCore/html/HTMLTrackElement.h (114255 => 114256)
--- trunk/Source/WebCore/html/HTMLTrackElement.h 2012-04-16 15:10:08 UTC (rev 114255)
+++ trunk/Source/WebCore/html/HTMLTrackElement.h 2012-04-16 15:13:25 UTC (rev 114256)
@@ -77,7 +77,7 @@
virtual void parseAttribute(Attribute*) OVERRIDE;
- virtual void insertedIntoTree(bool) OVERRIDE;
+ virtual void insertedIntoDocument() OVERRIDE;
virtual void willRemove() OVERRIDE;
virtual bool isURLAttribute(Attribute*) const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
