Use mirrored layer's content scale instead of mirror layer's

Render surface textures have the surface content scale already applied
to them when they are generated. Because of this, the surface content
scale component of the target draw transform needs to be removed.

In the case of a mirror layer, a RenderPassDrawQuad (RPDQ) is used that
points to the render surface texture of the mirrored layer. Similar to
the RPDQ of the mirrored layer, the RPDQ of the mirror layer also has to
have its surface content scale component removed from its target draw
transform. However, since this RPDQ points to the render surface texture
of the mirrored layer, the inverse surface scale content of the mirrored
layer must be applied rather than that of the mirror layer. This patch
makes this change.

Change-Id: I2696d7af8f62872c623ea6516485671a9341484d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1696581Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Mohsen Izadi <mohsen@chromium.org>
Commit-Queue: Malay Keshav <malaykeshav@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676588}

cc/layers/mirror_layer_impl.cc

@@ -41,8 +41,8 @@ void MirrorLayerImpl::AppendQuads(viz::RenderPass* render_pass,
   viz::SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
   PopulateScaledSharedQuadStateWithContentRects(
-      shared_quad_state, GetIdealContentsScale(), content_rect, content_rect,
-      contents_opaque);
+      shared_quad_state, mirrored_layer->GetIdealContentsScale(), content_rect,
+      content_rect, contents_opaque);
 
   AppendDebugBorderQuad(render_pass, content_rect, shared_quad_state,
                         append_quads_data);
@@ -75,7 +75,10 @@ gfx::Rect MirrorLayerImpl::GetDamageRect() const {
 }
 
 gfx::Rect MirrorLayerImpl::GetEnclosingRectInTargetSpace() const {
-  return GetScaledEnclosingRectInTargetSpace(GetIdealContentsScale());
+  const LayerImpl* mirrored_layer =
+      layer_tree_impl()->LayerById(mirrored_layer_id_);
+  return GetScaledEnclosingRectInTargetSpace(
+      mirrored_layer->GetIdealContentsScale());
 }
 
 const char* MirrorLayerImpl::LayerTypeAsString() const {

cc/trees/layer_tree_host_pixeltest_mirror.cc

@@ -17,14 +17,14 @@ namespace {
 
 class LayerTreeHostMirrorPixelTest
     : public LayerTreePixelTest,
-      public ::testing::WithParamInterface<LayerTreeTest::RendererType> {
+      public ::testing::WithParamInterface<
+          ::testing::tuple<LayerTreeTest::RendererType, bool>> {
  protected:
-  RendererType renderer_type() { return GetParam(); }
+  RendererType renderer_type() { return std::get<0>(GetParam()); }
 
   void InitializeSettings(LayerTreeSettings* settings) override {
-    // MirrorLayer is only used by UI compositor; so, match its behavior by
-    // setting layer_transforms_should_scale_layer_contents to false.
-    settings->layer_transforms_should_scale_layer_contents = false;
+    settings->layer_transforms_should_scale_layer_contents =
+        std::get<1>(GetParam());
   }
 };
 
@@ -37,9 +37,11 @@ const LayerTreeTest::RendererType kRendererTypes[] = {
 #endif
 };
 
-INSTANTIATE_TEST_SUITE_P(,
-                         LayerTreeHostMirrorPixelTest,
-                         ::testing::ValuesIn(kRendererTypes));
+INSTANTIATE_TEST_SUITE_P(
+    ,
+    LayerTreeHostMirrorPixelTest,
+    ::testing::Combine(::testing::ValuesIn(kRendererTypes),
+                       /*layer_transforms_scale_content=*/testing::Bool()));
 
 // Verifies that a mirror layer with a scale mirrors another layer correctly.
 TEST_P(LayerTreeHostMirrorPixelTest, MirrorLayer) {