cc: Make PaintedScrollbarLayer not use ContentsScalingLayer

cc/test/layer_test_common.cc

Index: cc/test/layer_test_common.cc
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index 7e835b892a59a1fe372672fad0dddd2dec52e13d..b6a0da6f6c9a605bdc096ce6c1922382db30898f 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -75,9 +75,17 @@ void LayerTestCommon::VerifyQuadsAreOccluded(const QuadList& quads,
 
   // Quads that are fully occluded on one axis only should be shrunken.
   for (const auto& quad : quads) {
-    DCHECK(quad->quadTransform().IsIdentityOrIntegerTranslation());
     gfx::Rect target_rect =
         MathUtil::MapEnclosingClippedRect(quad->quadTransform(), quad->rect);
+    if (!quad->quadTransform().IsIdentityOrIntegerTranslation()) {

[enne (OOO), 2015/02/12 21:55:56]

Now that the occlusion test has a scale transform in it, I had to adjust this to
make the test framework not yell.

+      DCHECK(quad->quadTransform().IsPositiveScaleOrTranslation())
+          << quad->quadTransform().ToString();
+      gfx::RectF target_rectf =
+          MathUtil::MapClippedRect(quad->quadTransform(), quad->rect);
+      // Scale transforms allowed, as long as the final transformed rect
+      // ends up on integer boundaries for ease of testing.
+      DCHECK_EQ(target_rectf.ToString(), gfx::RectF(target_rect).ToString());
+    }
     gfx::Rect target_visible_rect = MathUtil::MapEnclosingClippedRect(
         quad->quadTransform(), quad->visible_rect);