BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1

Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 2 insertions, 21 deletions

diff --git a/chromium/cc/layers/draw_properties.h b/chromium/cc/layers/draw_properties.h
index 2f3ce5d5012..071c853b2b9 100644
--- a/chromium/cc/layers/draw_properties.h
+++ b/chromium/cc/layers/draw_properties.h
@@ -7,14 +7,13 @@
 
 #include <stddef.h>
 
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
 #include "cc/trees/occlusion.h"
-#include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
-class LayerImpl;
 
 // Container for properties that layers need to compute before they can be
 // drawn.
@@ -49,11 +48,6 @@ struct CC_EXPORT DrawProperties {
   // True if the layer needs to be clipped by clip_rect.
   bool is_clipped;
 
-  // The layer whose coordinate space this layer draws into. This can be
-  // either the same layer (draw_properties_.render_target == this) or an
-  // ancestor of this layer.
-  LayerImpl* render_target;
-
   // This rect is a bounding box around what part of the layer is visible, in
   // the layer's coordinate space.
   gfx::Rect visible_layer_rect;
@@ -66,19 +60,6 @@ struct CC_EXPORT DrawProperties {
   // value is used to avoid unnecessarily changing GL scissor state.
   gfx::Rect clip_rect;
 
-  // Number of descendants with a clip parent that is our ancestor. NB - this
-  // does not include our clip children because they are clipped by us.
-  size_t num_unclipped_descendants;
-
-  // Each time we generate a new render surface layer list, an ID is used to
-  // identify it. |last_drawn_render_surface_layer_list_id| is set to the ID
-  // that marked the render surface layer list generation which last updated
-  // these draw properties and determined that this layer will draw itself.
-  // If these draw properties are not a part of the render surface layer list,
-  // or the layer doesn't contribute anything, then this ID will be either out
-  // of date or 0.
-  int last_drawn_render_surface_layer_list_id;
-
   // The maximum scale during the layers current animation at which content
   // should be rastered at to be crisp.
   float maximum_animation_contents_scale;