Changeset 181665 in webkit

Timestamp:

Mar 17, 2015 2:29:21 PM (9 years ago)

Author:

peavo@outlook.com

Message:

[WinCairo] Video position is incorrect when located inside a frame.
​https://bugs.webkit.org/show_bug.cgi?id=142784

Reviewed by Brent Fulgham.

We need to take the enclosing frame's position into account, when finding the video position.

• platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:

(WebCore::MediaPlayerPrivateMediaFoundation::setSize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-17  Per Arne Vollan  <peavo@outlook.com>
+
+        [WinCairo] Video position is incorrect when located inside a frame.
+        https://bugs.webkit.org/show_bug.cgi?id=142784
+
+        Reviewed by Brent Fulgham.
+
+        We need to take the enclosing frame's position into account, when finding the video position.
+
+        * platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
+        (WebCore::MediaPlayerPrivateMediaFoundation::setSize):
+
 2015-03-17  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp

@@ -205 +205 @@
 
     LayoutSize scrollOffset;
+    IntPoint positionInWindow(m_lastPaintRect.location());
 
     FrameView* view = nullptr;
     if (m_player && m_player->cachedResourceLoader() && m_player->cachedResourceLoader()->document())
         view = m_player->cachedResourceLoader()->document()->view();
-    if (view)
+
+    if (view) {
         scrollOffset = view->scrollOffsetForFixedPosition();
-
-    int xPos = -scrollOffset.width().toInt() + m_lastPaintRect.x();
-    int yPos = -scrollOffset.height().toInt() + m_lastPaintRect.y();
+        positionInWindow = view->convertToContainingWindow(m_lastPaintRect.location());
+    }
+
+    positionInWindow.move(-scrollOffset.width().toInt(), -scrollOffset.height().toInt());
 
     if (m_hwndVideo && !m_lastPaintRect.isEmpty())
-        ::MoveWindow(m_hwndVideo, xPos, yPos, m_size.width(), m_size.height(), FALSE);
+        ::MoveWindow(m_hwndVideo, positionInWindow.x(), positionInWindow.y(), m_size.width(), m_size.height(), FALSE);
 
     RECT rc = { 0, 0, m_size.width(), m_size.height() };