Changeset 155390 in webkit

Timestamp:

Sep 9, 2013, 3:15:41 PM (13 years ago)

Author:

hyatt@apple.com

Message:

REGRESSION (r155377): Convert the media elements that were RenderBlocks to RenderBlockFlows
​https://bugs.webkit.org/show_bug.cgi?id=121052

Reviewed by Anders Carlsson.

Convert a couple of media renderers that I missed from RenderBlock to RenderBlockFlow.
The previous patch that I landed added asserts that get triggered now when this
situation occurs.

• rendering/RenderMediaControlElements.cpp:

(WebCore::RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer):
(WebCore::RenderMediaVolumeSliderContainer::layout):
(WebCore::RenderTextTrackContainerElement::RenderTextTrackContainerElement):
(WebCore::RenderTextTrackContainerElement::layout):

• rendering/RenderMediaControlElements.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderMediaControlElements.cpp (modified) (4 diffs)
• rendering/RenderMediaControlElements.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-09  David Hyatt  <hyatt@apple.com>
+
+        REGRESSION (r155377): Convert the media elements that were RenderBlocks to RenderBlockFlows
+        https://bugs.webkit.org/show_bug.cgi?id=121052
+
+        Reviewed by Anders Carlsson.
+
+        Convert a couple of media renderers that I missed from RenderBlock to RenderBlockFlow.
+        The previous patch that I landed added asserts that get triggered now when this
+        situation occurs.
+
+        * rendering/RenderMediaControlElements.cpp:
+        (WebCore::RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer):
+        (WebCore::RenderMediaVolumeSliderContainer::layout):
+        (WebCore::RenderTextTrackContainerElement::RenderTextTrackContainerElement):
+        (WebCore::RenderTextTrackContainerElement::layout):
+        * rendering/RenderMediaControlElements.h:
+
 2013-09-09  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp

@@ -37 +37 @@
 
 RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(Element* element)
-    : RenderBlock(element)
+    : RenderBlockFlow(element)
 {
 }
@@ -43 +43 @@
 void RenderMediaVolumeSliderContainer::layout()
 {
-    RenderBlock::layout();
+    RenderBlockFlow::layout();
 
     if (style()->display() == NONE || !nextSibling() || !nextSibling()->isBox())
@@ -83 +83 @@
 
 RenderTextTrackContainerElement::RenderTextTrackContainerElement(Element* element)
-    : RenderBlock(element)
+    : RenderBlockFlow(element)
 {
 }
@@ -89 +89 @@
 void RenderTextTrackContainerElement::layout()
 {
-    RenderBlock::layout();
+    RenderBlockFlow::layout();
     if (style()->display() == NONE)
         return;

trunk/Source/WebCore/rendering/RenderMediaControlElements.h

@@ -32 +32 @@
 
 #include "MediaControlElements.h"
-#include "RenderBlock.h"
+#include "RenderBlockFlow.h"
 #include "RenderFlexibleBox.h"
 
 namespace WebCore {
 
-class RenderMediaVolumeSliderContainer FINAL : public RenderBlock {
+class RenderMediaVolumeSliderContainer FINAL : public RenderBlockFlow {
 public:
     RenderMediaVolumeSliderContainer(Element*);
@@ -59 +59 @@
 #if ENABLE(VIDEO_TRACK)
 
-class RenderTextTrackContainerElement FINAL : public RenderBlock {
+class RenderTextTrackContainerElement FINAL : public RenderBlockFlow {
 public:
     RenderTextTrackContainerElement(Element*);