Update from https://crrev.com/316786

cc/layers/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/layer_impl.h"
 
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
@@ skipping 157 matching lines @@
   DCHECK(!scroll_offset_delegate_);
 
   if (parent)
     DCHECK_EQ(layer_tree_impl()->LayerById(parent->id()), parent);
 
   scroll_parent_ = parent;
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetDebugInfo(
-    scoped_refptr<base::debug::ConvertableToTraceFormat> other) {
+    scoped_refptr<base::trace_event::ConvertableToTraceFormat> other) {
   debug_info_ = other;
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetScrollChildren(std::set<LayerImpl*>* children) {
   if (scroll_children_.get() == children)
     return;
   scroll_children_.reset(children);
   SetNeedsPushProperties();
 }
@@ skipping 65 matching lines @@
 }
 
 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const {
   state->SetAll(
       draw_properties_.target_space_transform, draw_properties_.content_bounds,
       draw_properties_.visible_content_rect, draw_properties_.clip_rect,
       draw_properties_.is_clipped, draw_properties_.opacity,
       draw_properties_.blend_mode, sorting_context_id_);
 }
 
+void LayerImpl::PopulateScaledSharedQuadState(SharedQuadState* state,
+                                              float scale) const {
+  gfx::Transform scaled_draw_transform =
+      draw_properties_.target_space_transform;
+  scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale);
+  gfx::Size scaled_content_bounds =
+      gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale));
+  gfx::Rect scaled_visible_content_rect =
+      gfx::ScaleToEnclosingRect(visible_content_rect(), scale);
+  scaled_visible_content_rect.Intersect(gfx::Rect(scaled_content_bounds));
+
+  state->SetAll(scaled_draw_transform, scaled_content_bounds,
+                scaled_visible_content_rect, draw_properties().clip_rect,
+                draw_properties().is_clipped, draw_properties().opacity,
+                draw_properties().blend_mode, sorting_context_id_);
+}
+
 bool LayerImpl::WillDraw(DrawMode draw_mode,
                          ResourceProvider* resource_provider) {
   // WillDraw/DidDraw must be matched.
   DCHECK_NE(DRAW_MODE_NONE, draw_mode);
   DCHECK_EQ(DRAW_MODE_NONE, current_draw_mode_);
   current_draw_mode_ = draw_mode;
   return true;
 }
 
 void LayerImpl::DidDraw(ResourceProvider* resource_provider) {
@@ skipping 46 matching lines @@
                                       float width) const {
   if (!ShowDebugBorders())
     return;
 
   gfx::Rect quad_rect(content_bounds);
   gfx::Rect visible_quad_rect(quad_rect);
   DebugBorderDrawQuad* debug_border_quad =
       render_pass->CreateAndAppendDrawQuad<DebugBorderDrawQuad>();
   debug_border_quad->SetNew(
       shared_quad_state, quad_rect, visible_quad_rect, color, width);
+  if (contents_opaque()) {
+    // When opaque, draw a second inner border that is thicker than the outer
+    // border, but more transparent.
+    static const float kFillOpacity = 0.3f;
+    SkColor fill_color = SkColorSetA(
+        color, static_cast<uint8_t>(SkColorGetA(color) * kFillOpacity));
+    float fill_width = width * 3;
+    gfx::Rect fill_rect = quad_rect;
+    fill_rect.Inset(fill_width / 2.f, fill_width / 2.f);
+    gfx::Rect visible_fill_rect =
+        gfx::IntersectRects(visible_quad_rect, fill_rect);
+    DebugBorderDrawQuad* fill_quad =
+        render_pass->CreateAndAppendDrawQuad<DebugBorderDrawQuad>();
+    fill_quad->SetNew(shared_quad_state, fill_rect, visible_fill_rect,
+                      fill_color, fill_width);
+  }
 }
 
 bool LayerImpl::HasDelegatedContent() const {
   return false;
 }
 
 bool LayerImpl::HasContributingDelegatedRenderPasses() const {
   return false;
 }
 
 RenderPassId LayerImpl::FirstContributingRenderPassId() const {
   return RenderPassId(0, 0);
 }
 
 RenderPassId LayerImpl::NextContributingRenderPassId(RenderPassId id) const {
   return RenderPassId(0, 0);
 }
 
-bool LayerImpl::UpdateTiles(const Occlusion& occlusion_in_layer_space,
-                            bool resourceless_software_draw) {
-  return false;
-}
-
 void LayerImpl::GetContentsResourceId(ResourceProvider::ResourceId* resource_id,
                                       gfx::Size* resource_size) const {
   NOTREACHED();
   *resource_id = 0;
 }
 
 gfx::Vector2dF LayerImpl::ScrollBy(const gfx::Vector2dF& scroll) {
   RefreshFromScrollDelegate();
 
   gfx::ScrollOffset adjusted_scroll(scroll);
@@ skipping 1031 matching lines @@
   num_dependents_need_push_properties_--;
   DCHECK_GE(num_dependents_need_push_properties_, 0);
 
   if (!parent_should_know_need_push_properties() && parent_)
       parent_->RemoveDependentNeedsPushProperties();
 }
 
 void LayerImpl::GetAllTilesForTracing(std::set<const Tile*>* tiles) const {
 }
 
-void LayerImpl::AsValueInto(base::debug::TracedValue* state) const {
+void LayerImpl::AsValueInto(base::trace_event::TracedValue* state) const {
   TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
       TRACE_DISABLED_BY_DEFAULT("cc.debug"),
       state,
       "cc::LayerImpl",
       LayerTypeAsString(),
       this);
   state->SetInteger("layer_id", id());
   MathUtil::AddToTracedValue("bounds", bounds_, state);
 
   state->SetDouble("opacity", opacity());
@@ skipping 141 matching lines @@
   SetNeedsPushProperties();
   layer_tree_impl()->set_needs_update_draw_properties();
   if (should_have_render_surface) {
     render_surface_ = make_scoped_ptr(new RenderSurfaceImpl(this));
     return;
   }
   render_surface_.reset();
 }
 
 }  // namespace cc