Changeset 139562 in webkit

Timestamp:

Jan 13, 2013 4:25:21 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Styling disappears from the cue that's being styled by ::cue pseudo element
​https://bugs.webkit.org/show_bug.cgi?id=106723

Patch by Dima Gorbik <​dgorbik@apple.com> on 2013-01-13
Reviewed by Antti Koivisto.

Source/WebCore:

Fixes a regression caused by r138966. Setting a pseudoId in TextTrackCue::updateDisplayTree for m_allDocumentNodes
was triggering recalculating styles the next run loop. Now when this was removed we append the WebVTT tree after its children have
been marked by markFutureAndPastNodes so that correct styles are set within this append call.

Test: media/track/track-css-cue-lifetime.html

• html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::markFutureAndPastNodes): changing the type of the first argument because DocumentFragment is not a subclass
of Element.
(WebCore::TextTrackCue::updateDisplayTree): appending the WebVTT rendering tree after its children have been marked properly.

• html/track/TextTrackCue.h:

(TextTrackCue):

LayoutTests:

• media/track/captions-webvtt/styling-lifetime.vtt: Added.
• media/track/track-css-cue-lifetime-expected.txt: Added.
• media/track/track-css-cue-lifetime.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/captions-webvtt/styling-lifetime.vtt (added)
• LayoutTests/media/track/track-css-cue-lifetime-expected.txt (added)
• LayoutTests/media/track/track-css-cue-lifetime.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/track/TextTrackCue.cpp (modified) (2 diffs)
• Source/WebCore/html/track/TextTrackCue.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-13  Dima Gorbik  <dgorbik@apple.com>
+
+        Styling disappears from the cue that's being styled by ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=106723
+
+        Reviewed by Antti Koivisto.
+
+        * media/track/captions-webvtt/styling-lifetime.vtt: Added.
+        * media/track/track-css-cue-lifetime-expected.txt: Added.
+        * media/track/track-css-cue-lifetime.html: Added.
+
 2013-01-13  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-13  Dima Gorbik  <dgorbik@apple.com>
+
+        Styling disappears from the cue that's being styled by ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=106723
+
+        Reviewed by Antti Koivisto.
+
+        Fixes a regression caused by r138966. Setting a pseudoId in TextTrackCue::updateDisplayTree for m_allDocumentNodes
+        was triggering recalculating styles the next run loop. Now when this was removed we append the WebVTT tree after its children have
+        been marked by markFutureAndPastNodes so that correct styles are set within this append call.
+
+        Test: media/track/track-css-cue-lifetime.html
+
+        * html/track/TextTrackCue.cpp:
+        (WebCore::TextTrackCue::markFutureAndPastNodes): changing the type of the first argument because DocumentFragment is not a subclass
+        of Element.
+        (WebCore::TextTrackCue::updateDisplayTree): appending the WebVTT rendering tree after its children have been marked properly.
+        * html/track/TextTrackCue.h:
+        (TextTrackCue):
+
 2013-01-12  David Grogan  <dgrogan@chromium.org>
 

trunk/Source/WebCore/html/track/TextTrackCue.cpp

@@ -659 +659 @@
 }
     
-void TextTrackCue::markFutureAndPastNodes(Element* root, double previousTimestamp, double movieTime)
+void TextTrackCue::markFutureAndPastNodes(Node* root, double previousTimestamp, double movieTime)
 {
     DEFINE_STATIC_LOCAL(const String, timestampTag, (ASCIILiteral("timestamp")));
@@ -701 +701 @@
     // Update the two sets containing past and future WebVTT objects.
     RefPtr<DocumentFragment> referenceTree = getCueAsHTML();
-
+    markFutureAndPastNodes(referenceTree.get(), startTime(), movieTime);
     m_allDocumentNodes->appendChild(referenceTree);
-    markFutureAndPastNodes(m_allDocumentNodes.get(), startTime(), movieTime);
 }
 

trunk/Source/WebCore/html/track/TextTrackCue.h

@@ -136 +136 @@
     void updateDisplayTree(float);
     void removeDisplayTree();
-    void markFutureAndPastNodes(Element*, double, double);
+    void markFutureAndPastNodes(Node*, double, double);
 
     int calculateComputedLinePosition();