WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp

Index: third_party/WebKit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp	(revision 11154)
+++ third_party/WebKit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp	(working copy)
@@ -377,19 +377,18 @@
     m_videoWidget->setVisible(m_isVisible);
 }
 
-void MediaPlayerPrivate::setRect(const IntRect& newRect)
+void MediaPlayerPrivate::setSize(const IntSize& newSize)
 {
     if (!m_videoWidget)
         return;
 
-    LOG(Media, "MediaPlayerPrivatePhonon::setRect(%d,%d %dx%d)",
-                newRect.x(), newRect.y(),
-                newRect.width(), newRect.height());
+    LOG(Media, "MediaPlayerPrivatePhonon::setSize(%d,%d)",
+                newSize.width(), newSize.height());
 
     QRect currentRect = m_videoWidget->rect();
 
-    if (newRect.width() != currentRect.width() || newRect.height() != currentRect.height())
-        m_videoWidget->resize(newRect.width(), newRect.height());
+    if (newSize.width() != currentRect.width() || newSize.height() != currentRect.height())
+        m_videoWidget->resize(newSize.width(), newSize.height());
 }
 
 IntSize MediaPlayerPrivate::naturalSize() const