Changeset 82788 in webkit

Timestamp:

Apr 2, 2011 10:40:51 PM (13 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r82786): Media controls render incorrectly on GTK and Qt
​https://bugs.webkit.org/show_bug.cgi?id=57719

Reviewed by Maciej Stachowiak.

r82786 exposed an incorrect assumption inRenderMediaControlTimeDisplay::layout()
that the timeline container is the parent of the time display. This is not true
with the GTK media style, where the current time display is an inline box, and
thus wrapped in an anonymous flexible box. The code was incorrectly considering
the width of the anonymous box and deciding to hide the time display. Prior to
r82786, this mistake was corrected by the call to computeLogicalWidth() in line layout.

• rendering/MediaControlElements.cpp:

(WebCore::RenderMediaControlTimeDisplay::layout): Changed to skip past anonymous ancestors.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/MediaControlElements.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-02  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        REGRESSION (r82786): Media controls render incorrectly on GTK and Qt
+        https://bugs.webkit.org/show_bug.cgi?id=57719
+
+        r82786 exposed an incorrect assumption inRenderMediaControlTimeDisplay::layout()
+        that the timeline container is the parent of the time display. This is not true
+        with the GTK media style, where the current time display is an inline box, and
+        thus wrapped in an anonymous flexible box. The code was incorrectly considering
+        the width of the anonymous box and deciding to hide the time display. Prior to
+        r82786, this mistake was corrected by the call to computeLogicalWidth() in line layout.
+
+        * rendering/MediaControlElements.cpp:
+        (WebCore::RenderMediaControlTimeDisplay::layout): Changed to skip past anonymous ancestors.
+
 2011-04-02  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WebCore/rendering/MediaControlElements.cpp

@@ -1056 +1056 @@
     RenderFlexibleBox::layout();
     RenderBox* timelineContainerBox = parentBox();
+    while (timelineContainerBox && timelineContainerBox->isAnonymous())
+        timelineContainerBox = timelineContainerBox->parentBox();
+
     if (timelineContainerBox && timelineContainerBox->width() < minWidthToDisplayTimeDisplays)
         setWidth(0);