WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp

Index: third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp	(revision 11154)
+++ third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp	(working copy)
@@ -93,7 +93,7 @@
     virtual unsigned totalBytes() const { return 0; }
     virtual unsigned bytesLoaded() const { return 0; }
 
-    virtual void setRect(const IntRect&) { }
+    virtual void setSize(const IntSize&) { }
 
     virtual void paint(GraphicsContext*, const IntRect&) { }
 
@@ -357,10 +357,10 @@
     return m_private->totalBytes();
 }
 
-void MediaPlayer::setRect(const IntRect& r) 
+void MediaPlayer::setSize(const IntSize& size)
 { 
-    m_rect = r;
-    m_private->setRect(r);
+    m_size = size;
+    m_private->setSize(size);
 }
 
 bool MediaPlayer::visible() const