commit 868fa2fe829687343ffae624259930155e16dbd8
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
tree 54d316199dd9739c57c3aacd131853bbd6554a94
parent bb1bdbd796f966b5bf11f40ecbea12621c7bfac9

Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

cc/quads/draw_quad.h

diff --git a/cc/quads/draw_quad.h b/cc/quads/draw_quad.h
index 2073e1d..a92cddf 100644
--- a/cc/quads/draw_quad.h
+++ b/cc/quads/draw_quad.h
@@ -74,8 +74,11 @@
   bool IsDebugQuad() const { return material == DEBUG_BORDER; }
 
   bool ShouldDrawWithBlending() const {
-    return needs_blending || shared_quad_state->opacity < 1.0f ||
-        !opaque_rect.Contains(visible_rect);
+    if (needs_blending || shared_quad_state->opacity < 1.0f)
+      return true;
+    if (visible_rect.IsEmpty())
+      return false;
+    return !opaque_rect.Contains(visible_rect);
   }
 
   typedef ResourceProvider::ResourceId ResourceId;