Diff
Modified: trunk/LayoutTests/ChangeLog (98744 => 98745)
--- trunk/LayoutTests/ChangeLog 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/LayoutTests/ChangeLog 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,3 +1,19 @@
+2011-10-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98736.
+ http://trac.webkit.org/changeset/98736
+ https://bugs.webkit.org/show_bug.cgi?id=71125
+
+ This patch broke perf/array-binary-search.html test (Requested
+ by annacc on #webkit).
+
+ * media/track/track-load-error-readyState-expected.txt: Removed.
+ * media/track/track-load-error-readyState.html: Removed.
+ * media/track/track-load-from-element-readyState-expected.txt: Removed.
+ * media/track/track-load-from-element-readyState.html: Removed.
+ * media/track/track-load-from-src-readyState-expected.txt: Removed.
+ * media/track/track-load-from-src-readyState.html: Removed.
+
2011-10-28 Zoltan Herczeg <[email protected]>
Testing allowed identifier chars which are greater than 126
Deleted: trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt (98744 => 98745)
--- trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,6 +0,0 @@
-Tests the error event on HTMLTrackElement and ERROR readyState on TextTrack.
-
-EVENT(error)
-EXPECTED (track.track.readyState == '3') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/track/track-load-error-readyState.html (98744 => 98745)
--- trunk/LayoutTests/media/track/track-load-error-readyState.html 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/LayoutTests/media/track/track-load-error-readyState.html 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <script src=""
- <script src=""
- <script>
-
- function trackError()
- {
- consoleWrite("EVENT(error)");
- track = document.getElementById('testTrackError');
- testExpected("track.track.readyState", TextTrack.Error);
- endTest();
- }
-
- </script>
- </head>
- <body>
- <p>Tests the error event on HTMLTrackElement and ERROR readyState on TextTrack.</p>
- <video id="videotests">
- <track id="testTrackError" src="" _onerror_="trackError()">
- </video>
- </body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/media/track/track-load-from-element-readyState-expected.txt (98744 => 98745)
--- trunk/LayoutTests/media/track/track-load-from-element-readyState-expected.txt 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/LayoutTests/media/track/track-load-from-element-readyState-expected.txt 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,6 +0,0 @@
-Tests the load event on HTMLTrackElement and LOADED readyState on TextTrack when src is set on the element.
-
-EVENT(load)
-EXPECTED (track.track.readyState == '2') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/track/track-load-from-element-readyState.html (98744 => 98745)
--- trunk/LayoutTests/media/track/track-load-from-element-readyState.html 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/LayoutTests/media/track/track-load-from-element-readyState.html 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <script src=""
- <script src=""
- <script>
-
- function trackLoaded()
- {
- consoleWrite("EVENT(load)");
- track = document.getElementById('testTrackSrc');
- testExpected("track.track.readyState", TextTrack.Loaded);
- endTest();
- }
-
- </script>
- </head>
- <body>
- <p>Tests the load event on HTMLTrackElement and LOADED readyState on TextTrack when src is set on the element.</p>
- <video>
- <track id="testTrackSrc" src="" _onload_="trackLoaded()">
- </video>
- </body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/media/track/track-load-from-src-readyState-expected.txt (98744 => 98745)
--- trunk/LayoutTests/media/track/track-load-from-src-readyState-expected.txt 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/LayoutTests/media/track/track-load-from-src-readyState-expected.txt 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,7 +0,0 @@
-Tests the load event on HTMLTrackElement and LOADED readyState on TextTrack when src is set from _javascript_.
-
-EXPECTED (track.track.readyState == '0') OK
-EVENT(load)
-EXPECTED (track.track.readyState == '2') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/track/track-load-from-src-readyState.html (98744 => 98745)
--- trunk/LayoutTests/media/track/track-load-from-src-readyState.html 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/LayoutTests/media/track/track-load-from-src-readyState.html 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <script src=""
- <script src=""
- </head>
- <body>
- <p>Tests the load event on HTMLTrackElement and LOADED readyState on TextTrack when src is set from _javascript_.</p>
- <video>
- <track id="testTrackEmpty">
- </video>
- <script>
-
- function trackLoaded()
- {
- consoleWrite("EVENT(load)");
- testExpected("track.track.readyState", TextTrack.Loaded);
- endTest();
- }
-
- track = document.getElementById('testTrackEmpty');
- testExpected("track.track.readyState", TextTrack.None);
- track.addEventListener("load", function () { trackLoaded(); }, true);
- track.src = ""
-
- </script>
- </body>
-</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (98744 => 98745)
--- trunk/Source/WebCore/ChangeLog 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/Source/WebCore/ChangeLog 2011-10-28 18:43:36 UTC (rev 98745)
@@ -1,3 +1,23 @@
+2011-10-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98736.
+ http://trac.webkit.org/changeset/98736
+ https://bugs.webkit.org/show_bug.cgi?id=71125
+
+ This patch broke perf/array-binary-search.html test (Requested
+ by annacc on #webkit).
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::loadTextTracks):
+ (WebCore::HTMLMediaElement::addTrack):
+ * html/HTMLMediaElement.h:
+ * html/HTMLTrackElement.cpp:
+ (WebCore::HTMLTrackElement::insertedIntoTree):
+ (WebCore::HTMLTrackElement::willRemove):
+ * html/HTMLTrackElement.h:
+ * html/LoadableTextTrack.cpp:
+ (WebCore::LoadableTextTrack::cueLoadingCompleted):
+
2011-10-28 Julien Chaffraix <[email protected]>
RenderTableSection::recalcCells should not free its grid
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (98744 => 98745)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2011-10-28 18:43:36 UTC (rev 98745)
@@ -839,19 +839,13 @@
return;
for (Node* node = firstChild(); node; node = node->nextSibling()) {
- if (node->hasTagName(trackTag))
- loadNextTextTrack(static_cast<HTMLTrackElement*>(node));
+ if (node->hasTagName(trackTag)) {
+ HTMLTrackElement* track = static_cast<HTMLTrackElement*>(node);
+ track->load(ActiveDOMObject::scriptExecutionContext(), this);
+ }
}
}
-void HTMLMediaElement::loadNextTextTrack(HTMLTrackElement* track)
-{
- // FIXME(71124): This should schedule an *asynchronous* load.
- track->load(ActiveDOMObject::scriptExecutionContext(), this);
-
- // FIXME(71123): Add new track to list of text tracks and set the text track mode.
-}
-
void HTMLMediaElement::textTrackReadyStateChanged(TextTrack*)
{
// FIXME(62885): Implement.
@@ -1984,40 +1978,8 @@
{
return TextTrack::create(this, kind, label, language);
}
-
-void HTMLMediaElement::trackWasAdded(HTMLTrackElement* track)
-{
-#if !LOG_DISABLED
- if (track->hasTagName(trackTag)) {
- KURL url = ""
- LOG(Media, "HTMLMediaElement::trackWasAdded - 'src' is %s", urlForLogging(url).utf8().data());
- }
#endif
- loadNextTextTrack(track);
-}
-
-void HTMLMediaElement::trackWillBeRemoved(HTMLTrackElement* track)
-{
-#if !LOG_DISABLED
- if (track->hasTagName(trackTag)) {
- KURL url = ""
- LOG(Media, "HTMLMediaElement::trackWillBeRemoved - 'src' is %s", urlForLogging(url).utf8().data());
- }
-#endif
-}
-void HTMLMediaElement::trackSourceChanged(HTMLTrackElement* track)
-{
-#if !LOG_DISABLED
- if (track->hasTagName(trackTag)) {
- KURL url = ""
- LOG(Media, "HTMLMediaElement::trackSourceChanged - 'src' is %s", urlForLogging(url).utf8().data());
- }
-#endif
- loadNextTextTrack(track);
-}
-#endif
-
bool HTMLMediaElement::havePotentialSourceChild()
{
// Stash the current <source> node and next nodes so we can restore them after checking
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (98744 => 98745)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2011-10-28 18:43:36 UTC (rev 98745)
@@ -57,9 +57,6 @@
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
class Widget;
#endif
-#if ENABLE(VIDEO_TRACK)
-class HTMLTrackElement;
-#endif
// FIXME: The inheritance from MediaPlayerClient here should be private inheritance.
// But it can't be until the Chromium WebMediaPlayerClientImpl class is fixed so it
@@ -183,9 +180,6 @@
#if ENABLE(VIDEO_TRACK)
PassRefPtr<TextTrack> addTrack(const String& kind, const String& label = "", const String& language = "");
- virtual void trackWasAdded(HTMLTrackElement*);
- virtual void trackWillBeRemoved(HTMLTrackElement*);
- virtual void trackSourceChanged(HTMLTrackElement*);
#endif
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
@@ -358,7 +352,6 @@
#if ENABLE(VIDEO_TRACK)
void loadTextTracks();
- void loadNextTextTrack(HTMLTrackElement*);
// TextTrackClient
virtual void textTrackReadyStateChanged(TextTrack*);
Modified: trunk/Source/WebCore/html/HTMLTrackElement.cpp (98744 => 98745)
--- trunk/Source/WebCore/html/HTMLTrackElement.cpp 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/Source/WebCore/html/HTMLTrackElement.cpp 2011-10-28 18:43:36 UTC (rev 98745)
@@ -32,7 +32,6 @@
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "Logging.h"
-#include "ScriptEventListener.h"
using namespace std;
@@ -60,41 +59,22 @@
{
HTMLElement::insertedIntoTree(deep);
Element* parent = parentElement();
- if (parent && parent->isMediaElement())
- static_cast<HTMLMediaElement*>(parentNode())->trackWasAdded(this);
+ if (parent && parent->isMediaElement()) {
+ // TODO(annacc):
+ // static_cast<HTMLMediaElement*>(parentNode())->trackWasAdded(this);
+ }
}
void HTMLTrackElement::willRemove()
{
Element* parent = parentElement();
- if (parent && parent->isMediaElement())
- static_cast<HTMLMediaElement*>(parentNode())->trackWillBeRemoved(this);
+ if (parent && parent->isMediaElement()) {
+ // TODO(annacc):
+ // static_cast<HTMLMediaElement*>(parentNode())->trackWillBeRemoved(this);
+ }
HTMLElement::willRemove();
}
-void HTMLTrackElement::parseMappedAttribute(Attribute* attribute)
-{
- const QualifiedName& attrName = attribute->name();
-
- if (attrName == onloadAttr)
- setAttributeEventListener(eventNames().loadEvent, createAttributeEventListener(this, attribute));
- else if (attrName == onerrorAttr)
- setAttributeEventListener(eventNames().errorEvent, createAttributeEventListener(this, attribute));
- else
- HTMLElement::parseMappedAttribute(attribute);
-}
-
-void HTMLTrackElement::attributeChanged(Attribute* attr, bool preserveDecls)
-{
- HTMLElement::attributeChanged(attr, preserveDecls);
-
- const QualifiedName& attrName = attr->name();
- if (attrName == srcAttr) {
- if (!getAttribute(srcAttr).isEmpty() && parentNode())
- static_cast<HTMLMediaElement*>(parentNode())->trackSourceChanged(this);
- }
-}
-
KURL HTMLTrackElement::src() const
{
return document()->completeURL(getAttribute(srcAttr));
Modified: trunk/Source/WebCore/html/HTMLTrackElement.h (98744 => 98745)
--- trunk/Source/WebCore/html/HTMLTrackElement.h 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/Source/WebCore/html/HTMLTrackElement.h 2011-10-28 18:43:36 UTC (rev 98745)
@@ -60,9 +60,6 @@
HTMLTrackElement(const QualifiedName&, Document*);
virtual ~HTMLTrackElement();
- virtual void parseMappedAttribute(Attribute*);
- virtual void attributeChanged(Attribute*, bool preserveDecls);
-
virtual void insertedIntoTree(bool);
virtual void willRemove();
virtual bool isURLAttribute(Attribute*) const;
Modified: trunk/Source/WebCore/html/LoadableTextTrack.cpp (98744 => 98745)
--- trunk/Source/WebCore/html/LoadableTextTrack.cpp 2011-10-28 18:40:14 UTC (rev 98744)
+++ trunk/Source/WebCore/html/LoadableTextTrack.cpp 2011-10-28 18:43:36 UTC (rev 98745)
@@ -63,14 +63,11 @@
setReadyState(TextTrack::Loading);
}
-void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool loadingFailed)
+void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool)
{
ASSERT_UNUSED(loader, m_loader == loader);
- loadingFailed ? setReadyState(TextTrack::Error) : setReadyState(TextTrack::Loaded);
-
- if (m_loadingClient)
- m_loadingClient->textTrackLoadingCompleted(this, loadingFailed);
+ // FIXME(62885): Implement.
}
} // namespace WebCore
