Fix incorrect use of coords conversion for sticky elements

cc/trees/property_tree.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 <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 439 matching lines @@
     sticky_offset.set_y(sticky_offset.y() + top_delta);
   }
 
   sticky_data->total_sticky_box_sticky_offset =
       ancestor_sticky_box_offset + sticky_offset -
       sticky_box_rect.OffsetFromOrigin();
   sticky_data->total_containing_block_sticky_offset =
       ancestor_sticky_box_offset + ancestor_containing_block_offset +
       sticky_offset - sticky_box_rect.OffsetFromOrigin();
 
-  return sticky_offset - layer_offset - node->source_to_parent -
-         sticky_box_rect.OffsetFromOrigin();
+  return sticky_offset - layer_offset - sticky_box_rect.OffsetFromOrigin() -
+         ((node->source_node_id != node->parent_id)
+              ? node->source_offset + node->source_to_parent
+              : gfx::Vector2dF());
 }
 
 void TransformTree::UpdateLocalTransform(TransformNode* node) {
   gfx::Transform transform = node->post_local;
   if (NeedsSourceToParentUpdate(node)) {
     gfx::Transform to_parent;
     ComputeTranslation(node->source_node_id, node->parent_id, &to_parent);
     gfx::Vector2dF unsnapping;
     TransformNode* current;
     TransformNode* parent_node;
@@ skipping 1630 matching lines @@
   const EffectNode* effect_node = effect_tree.Node(effect_id);
 
   if (effect_node->surface_contents_scale.x() != 0.0 &&
       effect_node->surface_contents_scale.y() != 0.0)
     screen_space_transform.Scale(1.0 / effect_node->surface_contents_scale.x(),
                                  1.0 / effect_node->surface_contents_scale.y());
   return screen_space_transform;
 }
 
 }  // namespace cc