WebKit merge 41447:41498

Review URL: http://codereview.chromium.org/39297

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11210 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 3 deletions

diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc
index 81d0abc..cb054e5 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.cc
+++ b/chrome/renderer/webmediaplayer_delegate_impl.cc
@@ -255,11 +255,12 @@ int64 WebMediaPlayerDelegateImpl::GetTotalBytes() const {
   return pipeline_.GetTotalBytes();
 }
 
-void WebMediaPlayerDelegateImpl::SetRect(const gfx::Rect& rect) {
+void WebMediaPlayerDelegateImpl::SetSize(const gfx::Size& size) {
   DCHECK(main_loop_ && MessageLoop::current() == main_loop_);
 
   if (video_renderer_) {
-    video_renderer_->SetRect(rect);
+    // TODO(scherkus): Change API to use SetSize().
+    video_renderer_->SetRect(gfx::Rect(0, 0, size.width(), size.height()));
   }
 }
 
diff --git a/chrome/renderer/webmediaplayer_delegate_impl.h b/chrome/renderer/webmediaplayer_delegate_impl.h
index 95423c7..3a75b2f 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.h
+++ b/chrome/renderer/webmediaplayer_delegate_impl.h
@@ -84,7 +84,7 @@ class WebMediaPlayerDelegateImpl : public webkit_glue::WebMediaPlayerDelegate,
   virtual bool IsTotalBytesKnown();
 
   // Methods for painting.
-  virtual void SetRect(const gfx::Rect& rect);
+  virtual void SetSize(const gfx::Size& size);
 
   virtual void Paint(skia::PlatformCanvas *canvas, const gfx::Rect& rect);