Changeset 98745 in webkit

Timestamp:

Oct 28, 2011, 11:43:36 AM (15 years ago)

Author:

commit-queue@webkit.org

Message:

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).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-10-28

Source/WebCore:

• 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):

LayoutTests:

• 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-load-error-readyState-expected.txt (deleted)
• LayoutTests/media/track/track-load-error-readyState.html (deleted)
• LayoutTests/media/track/track-load-from-element-readyState-expected.txt (deleted)
• LayoutTests/media/track/track-load-from-element-readyState.html (deleted)
• LayoutTests/media/track/track-load-from-src-readyState-expected.txt (deleted)
• LayoutTests/media/track/track-load-from-src-readyState.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (3 diffs)
• Source/WebCore/html/HTMLTrackElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLTrackElement.h (modified) (1 diff)
• Source/WebCore/html/LoadableTextTrack.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-28  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <zherczeg@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -840 +840 @@
 
     for (Node* node = firstChild(); node; node = node->nextSibling()) {
-        if (node->hasTagName(trackTag))
-            loadNextTextTrack(static_cast<HTMLTrackElement*>(node));
-    }
-}
-
-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.
+        if (node->hasTagName(trackTag)) {
+            HTMLTrackElement* track = static_cast<HTMLTrackElement*>(node);
+            track->load(ActiveDOMObject::scriptExecutionContext(), this);
+        }
+    }
 }
 
@@ -1985 +1979 @@
     return TextTrack::create(this, kind, label, language);
 }
-
-void HTMLMediaElement::trackWasAdded(HTMLTrackElement* track)
-{
-#if !LOG_DISABLED
-    if (track->hasTagName(trackTag)) {
-        KURL url = track->getNonEmptyURLAttribute(srcAttr);
-        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 = track->getNonEmptyURLAttribute(srcAttr);
-        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 = track->getNonEmptyURLAttribute(srcAttr);
-        LOG(Media, "HTMLMediaElement::trackSourceChanged - 'src' is %s", urlForLogging(url).utf8().data());
-    }
-#endif
-    loadNextTextTrack(track);
-}
 #endif
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -58 +58 @@
 class Widget;
 #endif
-#if ENABLE(VIDEO_TRACK)
-class HTMLTrackElement;
-#endif
 
 // FIXME: The inheritance from MediaPlayerClient here should be private inheritance.
@@ -184 +181 @@
 #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
 
@@ -359 +353 @@
 #if ENABLE(VIDEO_TRACK)
     void loadTextTracks();
-    void loadNextTextTrack(HTMLTrackElement*);
 
     // TextTrackClient

trunk/Source/WebCore/html/HTMLTrackElement.cpp

@@ -33 +33 @@
 #include "HTMLNames.h"
 #include "Logging.h"
-#include "ScriptEventListener.h"
 
 using namespace std;
@@ -61 +60 @@
     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);
+    }
 }
 
@@ -68 +69 @@
 {
     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);
-    }
 }
 

trunk/Source/WebCore/html/HTMLTrackElement.h

@@ -61 +61 @@
     virtual ~HTMLTrackElement();
 
-    virtual void parseMappedAttribute(Attribute*);
-    virtual void attributeChanged(Attribute*, bool preserveDecls);
-
     virtual void insertedIntoTree(bool);
     virtual void willRemove();

trunk/Source/WebCore/html/LoadableTextTrack.cpp

@@ -64 +64 @@
 }
 
-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.
 }