Changes subtreeShouldRenderToSeparateSurface logic to account for explicit clipping

cc/texture_draw_quad.cc

 // Copyright 2012 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 "cc/texture_draw_quad.h"
 
 #include "base/logging.h"
 
 namespace cc {
 
@@ skipping 43 matching lines @@
 
 const TextureDrawQuad* TextureDrawQuad::MaterialCast(
     const DrawQuad* quad) {
   DCHECK(quad->material == DrawQuad::TEXTURE_CONTENT);
   return static_cast<const TextureDrawQuad*>(quad);
 }
 
 bool TextureDrawQuad::PerformClipping() {
   // This only occurs if the rect is only scaled and translated (and thus still
   // axis aligned).
-  if (!quadTransform().IsScaleOrTranslation())
+  if (!quadTransform().IsPositiveScaleOrTranslation())
     return false;
 
   // Grab our scale and make sure it's positive.
-  float x_scale = quadTransform().matrix().getDouble(0,0);
-  float y_scale = quadTransform().matrix().getDouble(1,1);
-  if (x_scale <= 0.0f || y_scale <= 0.0f)
-    return false;
+  float x_scale = static_cast<float>(quadTransform().matrix().getDouble(0, 0));

[shawnsingh, 2012/12/18 19:11:00]

don't forget to make these variables double as james and you had agreed =)  
looks like there are 4 lines that need that change

[whunt, 2012/12/18 19:48:15]

This is a slightly different piece of code than James and I were talking about. 
There need to be cast to floats because they're assigned to float values in
RectF and Vector2dF.


On 2012/12/18 19:11:00, shawnsingh wrote:

+  float y_scale = static_cast<float>(quadTransform().matrix().getDouble(1, 1));
 
   // Grab our offset.
   gfx::Vector2dF offset(
-      quadTransform().matrix().getDouble(0,3),
-      quadTransform().matrix().getDouble(1,3));
+      static_cast<float>(quadTransform().matrix().getDouble(0, 3)),
+      static_cast<float>(quadTransform().matrix().getDouble(1, 3)));
 
   // Transform the rect by the scale and offset.
   gfx::RectF rectF = rect;
   rectF.Scale(x_scale, y_scale);
   rectF += offset;
 
   // Perform clipping and check to see if the result is empty.
   gfx::RectF clippedRect = IntersectRects(rectF, clipRect());
   if (clippedRect.IsEmpty()) {
     rect = gfx::Rect();
@@ skipping 13 matching lines @@
   clippedRect.Scale(1.0f / x_scale, 1.0f / y_scale);
   rect = gfx::Rect(
       static_cast<int>(clippedRect.x() + 0.5f),
       static_cast<int>(clippedRect.y() + 0.5f),
       static_cast<int>(clippedRect.width() + 0.5f),
       static_cast<int>(clippedRect.height() + 0.5f));
   return true;
 }
 
 }  // namespace cc