Title: [145320] trunk/Source/WebCore
- Revision
- 145320
- Author
- [email protected]
- Date
- 2013-03-09 11:43:46 -0800 (Sat, 09 Mar 2013)
Log Message
Video size calculated incorrectly when PLUGIN_PROXY_FOR_VIDEO
https://bugs.webkit.org/show_bug.cgi?id=111912
Reviewed by Dean Jackson.
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::updateSizes): We use RenderPart when
PLUGIN_PROXY_FOR_VIDEO is defined, not RenderVideo.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145319 => 145320)
--- trunk/Source/WebCore/ChangeLog 2013-03-09 16:54:44 UTC (rev 145319)
+++ trunk/Source/WebCore/ChangeLog 2013-03-09 19:43:46 UTC (rev 145320)
@@ -1,3 +1,14 @@
+2013-03-09 Eric Carlson <[email protected]>
+
+ Video size calculated incorrectly when PLUGIN_PROXY_FOR_VIDEO
+ https://bugs.webkit.org/show_bug.cgi?id=111912
+
+ Reviewed by Dean Jackson.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::updateSizes): We use RenderPart when
+ PLUGIN_PROXY_FOR_VIDEO is defined, not RenderVideo.
+
2013-03-09 Sebastian Dröge <[email protected]>
Fix offset handling in GStreamer WebKitWebSource.
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (145319 => 145320)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-03-09 16:54:44 UTC (rev 145319)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-03-09 19:43:46 UTC (rev 145320)
@@ -59,6 +59,10 @@
#include "TextTrackList.h"
#endif
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+#include "RenderPart.h"
+#endif
+
namespace WebCore {
using namespace HTMLNames;
@@ -1314,9 +1318,15 @@
if (m_textTrackRepresentation)
videoBox = m_textTrackRepresentation->bounds();
else {
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+ if (!mediaElement->renderer() || !mediaElement->renderer()->isRenderPart())
+ return;
+ videoBox = pixelSnappedIntRect(toRenderPart(mediaElement->renderer())->contentBoxRect());
+#else
if (!mediaElement->renderer() || !mediaElement->renderer()->isVideo())
return;
videoBox = toRenderVideo(mediaElement->renderer())->videoBox();
+#endif
}
if (!forceUpdate && m_videoDisplaySize == videoBox)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
