cc: Add mask target size to the effect tree

cc/trees/effect_node.cc

 // Copyright 2016 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 "base/trace_event/trace_event_argument.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/proto/skia_conversions.h"
 #include "cc/trees/effect_node.h"
 
@@ skipping 32 matching lines @@
 bool EffectNode::operator==(const EffectNode& other) const {
   return id == other.id && parent_id == other.parent_id &&
          owner_id == other.owner_id && opacity == other.opacity &&
          screen_space_opacity == other.screen_space_opacity &&
          has_render_surface == other.has_render_surface &&
          has_copy_request == other.has_copy_request &&
          filters == other.filters &&
          background_filters == other.background_filters &&
          blend_mode == other.blend_mode &&
          surface_contents_scale == other.surface_contents_scale &&
+         unscaled_mask_target_size == other.unscaled_mask_target_size &&
          hidden_by_backface_visibility == other.hidden_by_backface_visibility &&
          double_sided == other.double_sided && is_drawn == other.is_drawn &&
          subtree_hidden == other.subtree_hidden &&
          has_potential_filter_animation ==
              other.has_potential_filter_animation &&
          has_potential_opacity_animation ==
              other.has_potential_opacity_animation &&
          is_currently_animating_filter == other.is_currently_animating_filter &&
          is_currently_animating_opacity ==
              other.is_currently_animating_opacity &&
@@ skipping 28 matching lines @@
   data->set_effect_changed(effect_changed);
   data->set_num_copy_requests_in_subtree(num_copy_requests_in_subtree);
   data->set_transform_id(transform_id);
   data->set_clip_id(clip_id);
   data->set_target_id(target_id);
   data->set_mask_layer_id(mask_layer_id);
   data->set_replica_layer_id(replica_layer_id);
   data->set_replica_mask_layer_id(replica_mask_layer_id);
   Vector2dFToProto(surface_contents_scale,
                    data->mutable_surface_contents_scale());
+  SizeToProto(unscaled_mask_target_size,
+              data->mutable_unscaled_mask_target_size());
 }
 
 void EffectNode::FromProtobuf(const proto::TreeNode& proto) {
   id = proto.id();
   parent_id = proto.parent_id();
   owner_id = proto.owner_id();
 
   DCHECK(proto.has_effect_node_data());
   const proto::EffectNodeData& data = proto.effect_node_data();
 
   opacity = data.opacity();
   screen_space_opacity = data.screen_space_opacity();
   blend_mode = SkXfermodeModeFromProto(data.blend_mode());
+  unscaled_mask_target_size = ProtoToSize(data.unscaled_mask_target_size());
   has_render_surface = data.has_render_surface();
   has_copy_request = data.has_copy_request();
   hidden_by_backface_visibility = data.hidden_by_backface_visibility();
   double_sided = data.double_sided();
   is_drawn = data.is_drawn();
   subtree_hidden = data.subtree_hidden();
   has_potential_filter_animation = data.has_potential_filter_animation();
   has_potential_opacity_animation = data.has_potential_opacity_animation();
   is_currently_animating_filter = data.is_currently_animating_filter();
   is_currently_animating_opacity = data.is_currently_animating_opacity();
@@ skipping 26 matching lines @@
                     num_copy_requests_in_subtree);
   value->SetInteger("transform_id", transform_id);
   value->SetInteger("clip_id", clip_id);
   value->SetInteger("target_id", target_id);
   value->SetInteger("mask_layer_id", mask_layer_id);
   value->SetInteger("replica_layer_id", replica_layer_id);
   value->SetInteger("replica_mask_layer_id", replica_mask_layer_id);
 }
 
 }  // namespace cc