summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-10-26 15:47:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-26 22:49:00 +0000
commit0786ff643d5e17434c668c4dab04d264b57dd41d (patch)
tree7a5dcaa27e2aae5ead46768d2d054cf5361b5278 /media
parenta0fccaa19bf127c85a1d6cbf2c6e916236319713 (diff)
downloadchromium_src-0786ff643d5e17434c668c4dab04d264b57dd41d.zip
chromium_src-0786ff643d5e17434c668c4dab04d264b57dd41d.tar.gz
chromium_src-0786ff643d5e17434c668c4dab04d264b57dd41d.tar.bz2
Compare the full rect in SkCanvasVideoRenderer::Paint for transform.
When the rects are not the same, transform the output. R=dalecurtis@chromium.org Review URL: https://codereview.chromium.org/1369563002 Cr-Commit-Position: refs/heads/master@{#356159}
Diffstat (limited to 'media')
-rw-r--r--media/renderers/skcanvas_video_renderer.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/media/renderers/skcanvas_video_renderer.cc b/media/renderers/skcanvas_video_renderer.cc
index 7863a0d..a382445 100644
--- a/media/renderers/skcanvas_video_renderer.cc
+++ b/media/renderers/skcanvas_video_renderer.cc
@@ -20,6 +20,7 @@
#include "third_party/skia/include/gpu/GrTextureProvider.h"
#include "third_party/skia/include/gpu/SkGr.h"
#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/skia_util.h"
// Skia internal format depends on a platform. On Android it is ABGR, on others
// it is ARGB.
@@ -350,10 +351,12 @@ void SkCanvasVideoRenderer::Paint(const scoped_refptr<VideoFrame>& video_frame,
paint.setXfermodeMode(mode);
paint.setFilterQuality(kLow_SkFilterQuality);
- const bool need_transform =
- video_rotation != VIDEO_ROTATION_0 ||
- dest_rect.size() != gfx::SizeF(video_frame->visible_rect().size()) ||
- !dest_rect.origin().IsOrigin();
+ const bool need_rotation = video_rotation != VIDEO_ROTATION_0;
+ const bool need_scaling =
+ dest_rect.size() !=
+ gfx::SizeF(gfx::SkISizeToSize(last_image_->dimensions()));
+ const bool need_translation = !dest_rect.origin().IsOrigin();
+ bool need_transform = need_rotation || need_scaling || need_translation;
if (need_transform) {
canvas->save();
canvas->translate(