Revert of cc: Make PaintedScrollbarLayer not use ContentsScalingLayer

cc/test/layer_test_common.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/test/layer_test_common.h"
 
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/draw_quad.h"
@@ skipping 57 matching lines @@
                                              size_t* partially_occluded_count) {
   // No quad should exist if it's fully occluded.
   for (const auto& quad : quads) {
     gfx::Rect target_visible_rect = MathUtil::MapEnclosingClippedRect(
         quad->quadTransform(), quad->visible_rect);
     EXPECT_FALSE(occluded.Contains(target_visible_rect));
   }
 
   // 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()) {
-      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);
 
     bool fully_occluded_horizontal = target_rect.x() >= occluded.x() &&
                                      target_rect.right() <= occluded.right();
     bool fully_occluded_vertical = target_rect.y() >= occluded.y() &&
                                    target_rect.bottom() <= occluded.bottom();
     bool should_be_occluded =
         target_rect.Intersects(occluded) &&
         (fully_occluded_vertical || fully_occluded_horizontal);
@@ skipping 71 matching lines @@
   render_pass_->shared_quad_state_list.clear();
   occlusion_tracker_.set_occluded_target_rect_for_contributing_surface(
       occluded);
   bool for_replica = false;
   RenderPassId id(1, 1);
   surface_impl->AppendQuads(
       render_pass_.get(), occlusion_tracker_, &data, for_replica, id);
 }
 
 }  // namespace cc