Title: [138469] trunk/Source/WebCore
- Revision
- 138469
- Author
- [email protected]
- Date
- 2012-12-25 18:15:15 -0800 (Tue, 25 Dec 2012)
Log Message
[BlackBerry] Media controls are drawn on top of one another for media with unknown duration.
https://bugs.webkit.org/show_bug.cgi?id=105747
Patch by John Griggs <[email protected]> on 2012-12-25
Reviewed by George Staikos.
No need to reposition controls when there is no timeline element, this mispositions them in the new design.
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::RenderThemeBlackBerry::adjustMediaControlStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138468 => 138469)
--- trunk/Source/WebCore/ChangeLog 2012-12-26 02:04:45 UTC (rev 138468)
+++ trunk/Source/WebCore/ChangeLog 2012-12-26 02:15:15 UTC (rev 138469)
@@ -1,3 +1,15 @@
+2012-12-25 John Griggs <[email protected]>
+
+ [BlackBerry] Media controls are drawn on top of one another for media with unknown duration.
+ https://bugs.webkit.org/show_bug.cgi?id=105747
+
+ Reviewed by George Staikos.
+
+ No need to reposition controls when there is no timeline element, this mispositions them in the new design.
+
+ * platform/blackberry/RenderThemeBlackBerry.cpp:
+ (WebCore::RenderThemeBlackBerry::adjustMediaControlStyle):
+
2012-12-25 Alexander Pavlov <[email protected]>
Web Inspector: Crash when modifying a rule that has been removed through _javascript_
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (138468 => 138469)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-12-26 02:04:45 UTC (rev 138468)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-12-26 02:15:15 UTC (rev 138469)
@@ -884,30 +884,6 @@
default:
break;
}
-
- if (!isfinite(mediaElement->duration())) {
- // Live streams have infinite duration with no timeline. Force the mute
- // and fullscreen buttons to the right. This is needed when webkit does
- // not render the timeline container because it has a webkit-box-flex
- // of 1 and normally allows those buttons to be on the right.
- switch (style->appearance()) {
- case MediaEnterFullscreenButtonPart:
- case MediaExitFullscreenButtonPart:
- style->setPosition(AbsolutePosition);
- style->setBottom(zero);
- style->setLeft(zero);
- style->setRight(controlsHeight);
- break;
- case MediaRewindButtonPart:
- // We hi-jack the Rewind Button ID to use it for the divider image
- style->setPosition(AbsolutePosition);
- style->setBottom(zero);
- style->setLeft(controlsHeight);
- break;
- default:
- break;
- }
- }
}
void RenderThemeBlackBerry::adjustSliderTrackStyle(StyleResolver*, RenderStyle* style, Element* element) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
