Revert two changes that accidentally got in my last checkin.

BUG=none
TEST=none

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

2 files changed, 0 insertions, 19 deletions

diff --git a/webkit/glue/media/video_renderer_impl.cc b/webkit/glue/media/video_renderer_impl.cc
index c47b96d..a7dc980 100644
--- a/webkit/glue/media/video_renderer_impl.cc
+++ b/webkit/glue/media/video_renderer_impl.cc
@@ -7,8 +7,6 @@
 #include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 
-extern void DrawHackSendVideo(media::VideoSurface& frame, const gfx::Rect& rect);
-
 namespace webkit_glue {
 
   VideoRendererImpl::VideoRendererImpl(WebMediaPlayerImpl::Proxy* proxy)
@@ -61,12 +59,6 @@ void VideoRendererImpl::SetRect(const gfx::Rect& rect) {
 // This method is always called on the renderer's thread.
 void VideoRendererImpl::Paint(skia::PlatformCanvas* canvas,
                               const gfx::Rect& dest_rect) {
-  base::TimeTicks now = base::TimeTicks::HighResNow();
-  if (!last_frame_.is_null()) {
-    HISTOGRAM_TIMES("Video.Decode", now - last_frame_);
-  }
-  last_frame_ = now;
-
   scoped_refptr<media::VideoFrame> video_frame;
   GetCurrentFrame(&video_frame);
   if (video_frame) {
@@ -137,10 +129,6 @@ void VideoRendererImpl::SlowPaint(media::VideoFrame* video_frame,
       DCHECK(frame_in.strides[media::VideoSurface::kUPlane] ==
              frame_in.strides[media::VideoSurface::kVPlane]);
       DCHECK(frame_in.planes == media::VideoSurface::kNumYUVPlanes);
-
-      DrawHackSendVideo(frame_in, dest_rect);
-
-#if 1
       bitmap_.lockPixels();
       media::YUVType yuv_type = (frame_in.format == media::VideoSurface::YV12) ?
                                 media::YV12 : media::YV16;
@@ -155,8 +143,6 @@ void VideoRendererImpl::SlowPaint(media::VideoFrame* video_frame,
                                bitmap_.rowBytes(),
                                yuv_type);
       bitmap_.unlockPixels();
-#endif
-      DrawHackSendVideo(frame_in, dest_rect);
       video_frame->Unlock();
     } else {
       NOTREACHED();
@@ -164,7 +150,6 @@ void VideoRendererImpl::SlowPaint(media::VideoFrame* video_frame,
   }
 
   // 2. Paint the bitmap to canvas.
-#if 1
   SkMatrix matrix;
   matrix.setTranslate(static_cast<SkScalar>(dest_rect.x()),
                       static_cast<SkScalar>(dest_rect.y()));
@@ -176,7 +161,6 @@ void VideoRendererImpl::SlowPaint(media::VideoFrame* video_frame,
                     SkIntToScalar(video_size_.height()));
   }
   canvas->drawBitmapMatrix(bitmap_, matrix, NULL);
-#endif
 }
 
 void VideoRendererImpl::FastPaint(media::VideoFrame* video_frame,
diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h
index 8acd730..b0fde12 100644
--- a/webkit/glue/media/video_renderer_impl.h
+++ b/webkit/glue/media/video_renderer_impl.h
@@ -16,7 +16,6 @@
 
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
-#include "base/time.h"
 #include "media/base/buffers.h"
 #include "media/base/factory.h"
 #include "media/base/filters.h"
@@ -105,8 +104,6 @@ class VideoRendererImpl : public media::VideoRendererBase {
   // The size of the video.
   gfx::Size video_size_;
 
-  base::TimeTicks last_frame_;
-
   DISALLOW_COPY_AND_ASSIGN(VideoRendererImpl);
 };