summaryrefslogtreecommitdiffstats
path: root/ui/surface
diff options
context:
space:
mode:
authormiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 04:46:22 +0000
committermiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 04:46:22 +0000
commit6ba2c68596347b43f42fe2bf7cbf12eea7267b3c (patch)
tree2870df7df2b22184e09438898bbdd4d3d995c412 /ui/surface
parent0449fc3ffdf27f391052e2f3ec2510c101c7b5b0 (diff)
downloadchromium_src-6ba2c68596347b43f42fe2bf7cbf12eea7267b3c.zip
chromium_src-6ba2c68596347b43f42fe2bf7cbf12eea7267b3c.tar.gz
chromium_src-6ba2c68596347b43f42fe2bf7cbf12eea7267b3c.tar.bz2
Crash fix (divide by zero) for ComputeLetterboxRegion() and extra sanity checks.
BUG=259599 TEST=Added expectation to ComputeLetterboxRegion unit test. Manually confirmed the crash mentioned in the bug went away with this fix. Review URL: https://chromiumcodereview.appspot.com/19092003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/surface')
-rw-r--r--ui/surface/accelerated_surface_win.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc
index 733f230..ba2a9ad 100644
--- a/ui/surface/accelerated_surface_win.cc
+++ b/ui/surface/accelerated_surface_win.cc
@@ -578,6 +578,8 @@ bool AcceleratedPresenter::DoCopyToYUV(
// the requested src subset. Clip to the actual back buffer.
gfx::Rect src_subrect = requested_src_subrect;
src_subrect.Intersect(gfx::Rect(back_buffer_size));
+ if (src_subrect.IsEmpty())
+ return false;
base::win::ScopedComPtr<IDirect3DSurface9> resized;
base::win::ScopedComPtr<IDirect3DTexture9> resized_as_texture;