Title: [155390] trunk/Source/WebCore
- Revision
- 155390
- Author
- [email protected]
- Date
- 2013-09-09 15:15:41 -0700 (Mon, 09 Sep 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (155389 => 155390)
--- trunk/Source/WebCore/ChangeLog 2013-09-09 22:15:19 UTC (rev 155389)
+++ trunk/Source/WebCore/ChangeLog 2013-09-09 22:15:41 UTC (rev 155390)
@@ -1,3 +1,21 @@
+2013-09-09 David Hyatt <[email protected]>
+
+ 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 <[email protected]>
[Bug Fix] Calling m_audioComponents.remove in removeAudioComponent (MediaStreamDescriptor)
Modified: trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp (155389 => 155390)
--- trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2013-09-09 22:15:19 UTC (rev 155389)
+++ trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2013-09-09 22:15:41 UTC (rev 155390)
@@ -36,13 +36,13 @@
namespace WebCore {
RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(Element* element)
- : RenderBlock(element)
+ : RenderBlockFlow(element)
{
}
void RenderMediaVolumeSliderContainer::layout()
{
- RenderBlock::layout();
+ RenderBlockFlow::layout();
if (style()->display() == NONE || !nextSibling() || !nextSibling()->isBox())
return;
@@ -82,13 +82,13 @@
#if ENABLE(VIDEO_TRACK)
RenderTextTrackContainerElement::RenderTextTrackContainerElement(Element* element)
- : RenderBlock(element)
+ : RenderBlockFlow(element)
{
}
void RenderTextTrackContainerElement::layout()
{
- RenderBlock::layout();
+ RenderBlockFlow::layout();
if (style()->display() == NONE)
return;
Modified: trunk/Source/WebCore/rendering/RenderMediaControlElements.h (155389 => 155390)
--- trunk/Source/WebCore/rendering/RenderMediaControlElements.h 2013-09-09 22:15:19 UTC (rev 155389)
+++ trunk/Source/WebCore/rendering/RenderMediaControlElements.h 2013-09-09 22:15:41 UTC (rev 155390)
@@ -31,12 +31,12 @@
#if ENABLE(VIDEO)
#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*);
@@ -58,7 +58,7 @@
#if ENABLE(VIDEO_TRACK)
-class RenderTextTrackContainerElement FINAL : public RenderBlock {
+class RenderTextTrackContainerElement FINAL : public RenderBlockFlow {
public:
RenderTextTrackContainerElement(Element*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
