WebKit merge 41447:41498

chrome/renderer/webmediaplayer_delegate_impl.h

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 //
 // Delegate calls from WebCore::MediaPlayerPrivate to google's video player.
 // It contains PipelineImpl which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // PipelineImpl would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 66 matching lines @@
   virtual void Pause();
   virtual void Stop();
   virtual void Seek(float time);
   virtual void SetEndTime(float time);
   virtual void SetPlaybackRate(float rate);
   virtual void SetVolume(float volume);
   virtual void SetVisible(bool visible);
   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);
 
   // True if a video is loaded.
   virtual bool IsVideo() const;
 
   // Dimension of the video.
   virtual size_t GetWidth() const;
   virtual size_t GetHeight() const;
 
@@ skipping 88 matching lines @@
   // |main_loop_|. |tasks_| can be access from main thread or the media threads
   // we need a lock for protecting it.
   Lock task_lock_;
   typedef std::vector<CancelableTask*> CancelableTaskList;
   CancelableTaskList tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerDelegateImpl);
 };
 
 #endif  // ifndef CHROME_RENDERER_WEBMEDIAPLAYER_DELEGATE_IMPL_H_