Changes the bounds being sent for occlusion from physical pixels to DIP

cc/layers/surface_layer_impl.cc

 // Copyright 2014 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/layers/surface_layer_impl.h"
 
 #include <stdint.h>
 
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/debug_colors.h"
@@ skipping 41 matching lines @@
   layer_impl->SetStretchContentToFillBounds(stretch_content_to_fill_bounds_);
 }
 
 void SurfaceLayerImpl::AppendQuads(RenderPass* render_pass,
                                    AppendQuadsData* append_quads_data) {
   AppendRainbowDebugBorder(render_pass);
 
   SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
 
+  float scale_x, scale_y;

[danakj, 2017/02/10 16:32:22]

Can you give this a name that describes what the scale is? Scale from what space
to what space?

[malaykeshav, 2017/02/10 20:24:58]

Done

+
   if (stretch_content_to_fill_bounds_) {
     // Stretches the surface contents to exactly fill the layer bounds,
     // regardless of scale or aspect ratio differences.
-    float scale_x = static_cast<float>(surface_info_.size_in_pixels().width()) /
-                    bounds().width();
-    float scale_y =
-        static_cast<float>(surface_info_.size_in_pixels().height()) /
-        bounds().height();
+    scale_x = static_cast<float>(surface_info_.size_in_pixels().width()) /
+              bounds().width();
+    scale_y = static_cast<float>(surface_info_.size_in_pixels().height()) /
+              bounds().height();
     PopulateScaledSharedQuadState(shared_quad_state, scale_x, scale_y);
   } else {
     PopulateScaledSharedQuadState(shared_quad_state,

[danakj, 2017/02/10 16:32:22]

We don't need 2 calls to Populate anymore, if we have these scale_x/y variables.
We can just call Populate below the if/else block with them.

[malaykeshav, 2017/02/10 20:24:58]

Done

                                   surface_info_.device_scale_factor(),
                                   surface_info_.device_scale_factor());
+
+    scale_x = scale_y = surface_info_.device_scale_factor();
   }
 
   if (!surface_info_.id().is_valid())
     return;
 
   gfx::Rect quad_rect(surface_info_.size_in_pixels());
   gfx::Rect visible_quad_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
-          quad_rect);
+          gfx::Rect(bounds()));
+
+  visible_quad_rect =
+      gfx::ScaleToEnclosedRect(visible_quad_rect, scale_x, scale_y);
+  visible_quad_rect = gfx::IntersectRects(quad_rect, visible_quad_rect);
 
   if (visible_quad_rect.IsEmpty())
     return;
   SurfaceDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   quad->SetNew(shared_quad_state, quad_rect, visible_quad_rect,
                surface_info_.id());
 }
 
 void SurfaceLayerImpl::GetDebugBorderProperties(SkColor* color,
@@ skipping 92 matching lines @@
 void SurfaceLayerImpl::AsValueInto(base::trace_event::TracedValue* dict) const {
   LayerImpl::AsValueInto(dict);
   dict->SetString("surface_id", surface_info_.id().ToString());
 }
 
 const char* SurfaceLayerImpl::LayerTypeAsString() const {
   return "cc::SurfaceLayerImpl";
 }
 
 }  // namespace cc