Rename webkit_media::VideoRendererImpl to webkit_media::SkCanvasVideoRenderer.

Review URL: https://chromiumcodereview.appspot.com/9255022

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

8 files changed, 42 insertions, 44 deletions

diff --git a/webkit/media/video_renderer_impl.cc b/webkit/media/skcanvas_video_renderer.cc
index 7860f04..96643e6 100644
--- a/webkit/media/video_renderer_impl.cc
+++ b/webkit/media/skcanvas_video_renderer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/skcanvas_video_renderer.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
@@ -229,15 +229,15 @@ static void ConvertVideoFrameToBitmap(
   bitmap->unlockPixels();
 }
 
-VideoRendererImpl::VideoRendererImpl()
+SkCanvasVideoRenderer::SkCanvasVideoRenderer()
     : last_frame_timestamp_(media::kNoTimestamp()) {
 }
 
-VideoRendererImpl::~VideoRendererImpl() {}
+SkCanvasVideoRenderer::~SkCanvasVideoRenderer() {}
 
-void VideoRendererImpl::Paint(media::VideoFrame* video_frame,
-                              SkCanvas* canvas,
-                              const gfx::Rect& dest_rect) {
+void SkCanvasVideoRenderer::Paint(media::VideoFrame* video_frame,
+                                  SkCanvas* canvas,
+                                  const gfx::Rect& dest_rect) {
   // Paint black rectangle if there isn't a frame available.
   if (!video_frame) {
     SkPaint paint;
diff --git a/webkit/media/video_renderer_impl.h b/webkit/media/skcanvas_video_renderer.h
index 6ab73b6..0773297 100644
--- a/webkit/media/video_renderer_impl.h
+++ b/webkit/media/skcanvas_video_renderer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_
-#define WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_
+#ifndef WEBKIT_MEDIA_SKCANVAS_VIDEO_RENDERER_H_
+#define WEBKIT_MEDIA_SKCANVAS_VIDEO_RENDERER_H_
 
 #include "base/time.h"
 #include "ui/gfx/rect.h"
@@ -19,10 +19,10 @@ namespace webkit_media {
 
 // Handles rendering of VideoFrames to SkCanvases, doing any necessary YUV
 // conversion and caching of resulting RGB bitmaps.
-class VideoRendererImpl {
+class SkCanvasVideoRenderer {
  public:
-  VideoRendererImpl();
-  ~VideoRendererImpl();
+  SkCanvasVideoRenderer();
+  ~SkCanvasVideoRenderer();
 
   // Paints |video_frame| on |canvas|, scaling the result to fit dimensions
   // specified by |dest_rect|.
@@ -38,9 +38,9 @@ class VideoRendererImpl {
   SkBitmap last_frame_;
   base::TimeDelta last_frame_timestamp_;
 
-  DISALLOW_COPY_AND_ASSIGN(VideoRendererImpl);
+  DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRenderer);
 };
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_
+#endif  // WEBKIT_MEDIA_SKCANVAS_VIDEO_RENDERER_H_
diff --git a/webkit/media/video_renderer_impl_unittest.cc b/webkit/media/skcanvas_video_renderer_unittest.cc
index 3afe623..14a8845 100644
--- a/webkit/media/video_renderer_impl_unittest.cc
+++ b/webkit/media/skcanvas_video_renderer_unittest.cc
@@ -7,7 +7,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
-#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/skcanvas_video_renderer.h"
 
 using media::VideoFrame;
 
@@ -34,15 +34,15 @@ SkColor GetColor(SkCanvas* canvas) {
   return c;
 }
 
-class VideoRendererImplTest : public testing::Test {
+class SkCanvasVideoRendererTest : public testing::Test {
  public:
   enum Color {
     kRed,
     kBlue,
   };
 
-  VideoRendererImplTest();
-  virtual ~VideoRendererImplTest();
+  SkCanvasVideoRendererTest();
+  virtual ~SkCanvasVideoRendererTest();
 
   // Paints to |canvas| using |renderer_| without any frame data.
   void PaintWithoutFrame(SkCanvas* canvas);
@@ -61,7 +61,7 @@ class VideoRendererImplTest : public testing::Test {
   SkCanvas* slow_path_canvas() { return &slow_path_canvas_; }
 
  private:
-  VideoRendererImpl renderer_;
+  SkCanvasVideoRenderer renderer_;
 
   scoped_refptr<VideoFrame> natural_frame_;
   scoped_refptr<VideoFrame> larger_frame_;
@@ -72,10 +72,10 @@ class VideoRendererImplTest : public testing::Test {
   SkDevice slow_path_device_;
   SkCanvas slow_path_canvas_;
 
-  DISALLOW_COPY_AND_ASSIGN(VideoRendererImplTest);
+  DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRendererTest);
 };
 
-VideoRendererImplTest::VideoRendererImplTest()
+SkCanvasVideoRendererTest::SkCanvasVideoRendererTest()
     : natural_frame_(VideoFrame::CreateBlackFrame(kWidth, kHeight)),
       larger_frame_(VideoFrame::CreateBlackFrame(kWidth * 2, kHeight * 2)),
       smaller_frame_(VideoFrame::CreateBlackFrame(kWidth / 2, kHeight / 2)),
@@ -89,15 +89,15 @@ VideoRendererImplTest::VideoRendererImplTest()
   smaller_frame_->SetTimestamp(base::TimeDelta::FromMilliseconds(3));
 }
 
-VideoRendererImplTest::~VideoRendererImplTest() {}
+SkCanvasVideoRendererTest::~SkCanvasVideoRendererTest() {}
 
-void VideoRendererImplTest::PaintWithoutFrame(SkCanvas* canvas) {
+void SkCanvasVideoRendererTest::PaintWithoutFrame(SkCanvas* canvas) {
   renderer_.Paint(NULL, canvas, kNaturalRect);
 }
 
-void VideoRendererImplTest::Paint(VideoFrame* video_frame,
-                                  SkCanvas* canvas,
-                                  Color color) {
+void SkCanvasVideoRendererTest::Paint(VideoFrame* video_frame,
+                                      SkCanvas* canvas,
+                                      Color color) {
   switch (color) {
     case kRed:
       media::FillYUV(video_frame, 76, 84, 255);
@@ -109,31 +109,31 @@ void VideoRendererImplTest::Paint(VideoFrame* video_frame,
   renderer_.Paint(video_frame, canvas, kNaturalRect);
 }
 
-TEST_F(VideoRendererImplTest, FastPaint_NoFrame) {
+TEST_F(SkCanvasVideoRendererTest, FastPaint_NoFrame) {
   // Test that black gets painted over canvas.
   FillCanvas(fast_path_canvas(), SK_ColorRED);
   PaintWithoutFrame(fast_path_canvas());
   EXPECT_EQ(SK_ColorBLACK, GetColor(fast_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, SlowPaint_NoFrame) {
+TEST_F(SkCanvasVideoRendererTest, SlowPaint_NoFrame) {
   // Test that black gets painted over canvas.
   FillCanvas(slow_path_canvas(), SK_ColorRED);
   PaintWithoutFrame(slow_path_canvas());
   EXPECT_EQ(SK_ColorBLACK, GetColor(slow_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, FastPaint_Natural) {
+TEST_F(SkCanvasVideoRendererTest, FastPaint_Natural) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, SlowPaint_Natural) {
+TEST_F(SkCanvasVideoRendererTest, SlowPaint_Natural) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, FastPaint_Larger) {
+TEST_F(SkCanvasVideoRendererTest, FastPaint_Larger) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
 
@@ -141,7 +141,7 @@ TEST_F(VideoRendererImplTest, FastPaint_Larger) {
   EXPECT_EQ(SK_ColorBLUE, GetColor(fast_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, SlowPaint_Larger) {
+TEST_F(SkCanvasVideoRendererTest, SlowPaint_Larger) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 
@@ -149,7 +149,7 @@ TEST_F(VideoRendererImplTest, SlowPaint_Larger) {
   EXPECT_EQ(SK_ColorBLUE, GetColor(slow_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, FastPaint_Smaller) {
+TEST_F(SkCanvasVideoRendererTest, FastPaint_Smaller) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
 
@@ -157,7 +157,7 @@ TEST_F(VideoRendererImplTest, FastPaint_Smaller) {
   EXPECT_EQ(SK_ColorBLUE, GetColor(fast_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, SlowPaint_Smaller) {
+TEST_F(SkCanvasVideoRendererTest, SlowPaint_Smaller) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 
@@ -165,21 +165,21 @@ TEST_F(VideoRendererImplTest, SlowPaint_Smaller) {
   EXPECT_EQ(SK_ColorBLUE, GetColor(slow_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, FastPaint_NoTimestamp) {
+TEST_F(SkCanvasVideoRendererTest, FastPaint_NoTimestamp) {
   VideoFrame* video_frame = natural_frame();
   video_frame->SetTimestamp(media::kNoTimestamp());
   Paint(video_frame, fast_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, SlowPaint_NoTimestamp) {
+TEST_F(SkCanvasVideoRendererTest, SlowPaint_NoTimestamp) {
   VideoFrame* video_frame = natural_frame();
   video_frame->SetTimestamp(media::kNoTimestamp());
   Paint(video_frame, slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, FastPaint_SameVideoFrame) {
+TEST_F(SkCanvasVideoRendererTest, FastPaint_SameVideoFrame) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
 
@@ -188,7 +188,7 @@ TEST_F(VideoRendererImplTest, FastPaint_SameVideoFrame) {
   EXPECT_EQ(SK_ColorBLUE, GetColor(fast_path_canvas()));
 }
 
-TEST_F(VideoRendererImplTest, SlowPaint_SameVideoFrame) {
+TEST_F(SkCanvasVideoRendererTest, SlowPaint_SameVideoFrame) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 97d4a67..1f691c3 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -26,8 +26,8 @@
         'media_stream_client.h',
         'simple_data_source.cc',
         'simple_data_source.h',
-        'video_renderer_impl.cc',
-        'video_renderer_impl.h',
+        'skcanvas_video_renderer.cc',
+        'skcanvas_video_renderer.h',
         'web_data_source.cc',
         'web_data_source_factory.cc',
         'web_data_source_factory.h',
diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
index 31e05e5..e974f5a 100644
--- a/webkit/media/webmediaplayer_proxy.h
+++ b/webkit/media/webmediaplayer_proxy.h
@@ -11,7 +11,7 @@
 #include "base/synchronization/lock.h"
 #include "media/base/pipeline.h"
 #include "media/filters/chunk_demuxer_client.h"
-#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/skcanvas_video_renderer.h"
 #include "webkit/media/web_data_source.h"
 
 class MessageLoop;
@@ -119,7 +119,7 @@ class WebMediaPlayerProxy
   DataSourceList data_sources_;
 
   scoped_refptr<media::VideoRendererBase> frame_provider_;
-  VideoRendererImpl video_renderer_;
+  SkCanvasVideoRenderer video_renderer_;
 
   base::Lock lock_;
   int outstanding_repaints_;
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 267e24c..1b39cb2 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -50,7 +50,6 @@
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
-#include "webkit/media/video_renderer_impl.h"
 #include "webkit/media/webmediaplayer_impl.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 432033a..c1f9e35 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -435,9 +435,9 @@
         '../../media/buffered_data_source_unittest.cc',
         '../../media/buffered_resource_loader_unittest.cc',
         '../../media/simple_data_source_unittest.cc',
+        '../../media/skcanvas_video_renderer_unittest.cc',
         '../../media/test_response_generator.cc',
         '../../media/test_response_generator.h',
-        '../../media/video_renderer_impl_unittest.cc',
         '../../mocks/mock_resource_loader_bridge.h',
         '../../mocks/mock_webframeclient.h',
         '../../mocks/mock_weburlloader.cc',
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index f7a5865..5c4f652 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -65,7 +65,6 @@
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/weburlrequest_extradata_impl.h"
 #include "webkit/glue/window_open_disposition.h"
-#include "webkit/media/video_renderer_impl.h"
 #include "webkit/media/webmediaplayer_impl.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/plugin_list.h"