roll skia to 2193

webkit/glue/media/video_renderer_impl.cc

 // Copyright (c) 2011 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.
 
 #include "webkit/glue/media/video_renderer_impl.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "webkit/glue/webmediaplayer_proxy.h"
 
-// Transform destination rect to local coordinates.
-static void TransformToSkIRect(const SkMatrix& matrix,
-                               const gfx::Rect& src_rect,
-                               SkIRect* dest_rect) {
-  SkRect transformed_rect;
-  SkRect skia_dest_rect;
-  skia_dest_rect.iset(src_rect.x(), src_rect.y(),
-                      src_rect.right(), src_rect.bottom());
-  matrix.mapRect(&transformed_rect, skia_dest_rect);
-  transformed_rect.round(dest_rect);
-}
-
 namespace webkit_glue {
 
 VideoRendererImpl::VideoRendererImpl(bool pts_logging)
     : last_converted_frame_(NULL),
       pts_logging_(pts_logging) {
 }
 
 VideoRendererImpl::~VideoRendererImpl() {}
 
 bool VideoRendererImpl::OnInitialize(media::VideoDecoder* decoder) {
@@ skipping 84 matching lines @@
 
   const SkMatrix& total_matrix = canvas->getTotalMatrix();
   // Perform the following checks here:
   // 1. Check for skewing factors of the transformation matrix. They should be
   //    zero.
   // 2. Check for mirroring and flipping. Make sure they are greater than zero.
   if (SkScalarNearlyZero(total_matrix.getSkewX()) &&
       SkScalarNearlyZero(total_matrix.getSkewY()) &&
       total_matrix.getScaleX() > 0 &&
       total_matrix.getScaleY() > 0) {
-    // Get the properties of the SkDevice and the clip rect.
     SkDevice* device = canvas->getDevice();
+    const SkBitmap::Config config = device->config();
 
-    // Get the boundary of the device.
-    SkIRect device_rect;
-    device->getBounds(&device_rect);
-
-    // Get the pixel config of the device.
-    const SkBitmap::Config config = device->config();
-    // Get the total clip rect associated with the canvas.
-    const SkRegion& total_clip = canvas->getTotalClip();
-
-    SkIRect dest_irect;
-    TransformToSkIRect(canvas->getTotalMatrix(), dest_rect, &dest_irect);
-
-    if (config == SkBitmap::kARGB_8888_Config && device->isOpaque() &&
-        device_rect.contains(total_clip.getBounds())) {
+    if (config == SkBitmap::kARGB_8888_Config && device->isOpaque()) {
       return true;
     }
   }
 
   return false;
 }
 
 void VideoRendererImpl::SlowPaint(media::VideoFrame* video_frame,
                                   SkCanvas* canvas,
                                   const gfx::Rect& dest_rect) {
@@ skipping 139 matching lines @@
                            video_frame->stride(media::VideoFrame::kUPlane),
                            bitmap.rowBytes(),
                            yuv_type,
                            media::ROTATE_0,
                            media::FILTER_BILINEAR);
     bitmap.unlockPixels();
   }
 }
 
 }  // namespace webkit_glue