WebKit merge 41447:41498 [third_party/WebKit]

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

 /*
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 75 matching lines @@
 
     virtual float maxTimeSeekable() const { return 0; }
     virtual float maxTimeBuffered() const { return 0; }
 
     virtual int dataRate() const { return 0; }
 
     virtual bool totalBytesKnown() const { return false; }
     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&) { }
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     virtual void setPoster(const String& /*url*/) { }
     virtual void deliverNotification(MediaPlayerProxyNotificationType) { }
     virtual void setMediaPlayerProxy(WebMediaPlayerProxy*) { }
 #endif
 };
 
@@ skipping 243 matching lines @@
 bool MediaPlayer::totalBytesKnown()
 {
     return m_private->totalBytesKnown();
 }
 
 unsigned MediaPlayer::totalBytes()
 {
     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
 {
     return m_visible;
 }
 
 void MediaPlayer::setVisible(bool b)
 {
     m_visible = b;
@@ skipping 71 matching lines @@
 }
 
 void MediaPlayer::repaint()
 {
     if (m_mediaPlayerClient)
         m_mediaPlayerClient->mediaPlayerRepaint(this);
 }
 
 }
 #endif