Update from https://crrev.com/316786

cc/layers/nine_patch_layer_impl.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/layers/nine_patch_layer_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/quads/texture_draw_quad.h"
@@ skipping 64 matching lines @@
 
   // |aperture| is in image space.  It cannot exceed the bounds of the bitmap.
   DCHECK(!image_aperture_.size().IsEmpty());
   DCHECK(gfx::Rect(image_bounds_).Contains(image_aperture_))
       << "image_bounds_ " << gfx::Rect(image_bounds_).ToString()
       << " image_aperture_ " << image_aperture_.ToString();
 }
 
 void NinePatchLayerImpl::AppendQuads(
     RenderPass* render_pass,
-    const Occlusion& occlusion_in_content_space,
     AppendQuadsData* append_quads_data) {
   CheckGeometryLimitations();
   SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
   PopulateSharedQuadState(shared_quad_state);
 
   AppendDebugBorderQuad(
       render_pass, content_bounds(), shared_quad_state, append_quads_data);
 
   if (!ui_resource_id_)
@@ skipping 111 matching lines @@
                        uv_top_left.bottom(),
                        uv_top.width(),
                        uv_left.height());
 
   gfx::Rect opaque_rect;
   gfx::Rect visible_rect;
   const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
   const bool opaque = layer_tree_impl()->IsUIResourceOpaque(ui_resource_id_);
 
   visible_rect =
-      occlusion_in_content_space.GetUnoccludedContentRect(layer_top_left);
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_top_left);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top_left.origin(),
                  uv_top_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
   visible_rect =
-      occlusion_in_content_space.GetUnoccludedContentRect(layer_top_right);
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_top_right);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top_right,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top_right.origin(),
                  uv_top_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
   visible_rect =
-      occlusion_in_content_space.GetUnoccludedContentRect(layer_bottom_left);
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_bottom_left);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom_left.origin(),
                  uv_bottom_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
   visible_rect =
-      occlusion_in_content_space.GetUnoccludedContentRect(layer_bottom_right);
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_bottom_right);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom_right,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom_right.origin(),
                  uv_bottom_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
-  visible_rect = occlusion_in_content_space.GetUnoccludedContentRect(layer_top);
+  visible_rect =
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_top);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top.origin(),
                  uv_top.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
   visible_rect =
-      occlusion_in_content_space.GetUnoccludedContentRect(layer_left);
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_left);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_left.origin(),
                  uv_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
   visible_rect =
-      occlusion_in_content_space.GetUnoccludedContentRect(layer_right);
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_right);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_right,
                  opaque_rect,
                  layer_right,
                  resource,
                  premultiplied_alpha,
                  uv_right.origin(),
                  uv_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
   visible_rect =
-      occlusion_in_content_space.GetUnoccludedContentRect(layer_bottom);
+      draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+          layer_bottom);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom.origin(),
                  uv_bottom.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
   }
 
   if (fill_center_) {
     visible_rect =
-        occlusion_in_content_space.GetUnoccludedContentRect(layer_center);
+        draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+            layer_center);
     opaque_rect = opaque ? visible_rect : gfx::Rect();
     if (!visible_rect.IsEmpty()) {
       TextureDrawQuad* quad =
           render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
       quad->SetNew(shared_quad_state,
                    layer_center,
                    opaque_rect,
                    visible_rect,
                    resource,
                    premultiplied_alpha,
@@ skipping 27 matching lines @@
   result->Set("ImageBounds", list);
 
   result->Set("Border", MathUtil::AsValue(border_).release());
 
   result->SetBoolean("FillCenter", fill_center_);
 
   return result;
 }
 
 }  // namespace cc