Detemplatize cc property nodes

cc/input/scroll_state_data.cc

 // Copyright 2015 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/input/scroll_state_data.h"
+#include "cc/trees/scroll_node.h"
 
 namespace cc {
 
 ScrollStateData::ScrollStateData()
     : delta_x(0),
       delta_y(0),
       position_x(0),
       position_y(0),
       velocity_x(0),
       velocity_y(0),
@@ skipping 16 matching lines @@
 }
 
 void ScrollStateData::set_current_native_scrolling_node(
     ScrollNode* current_native_scrolling_node) {
   current_native_scrolling_node_ = current_native_scrolling_node;
   current_native_scrolling_element_ = ElementId();
 }
 
 ElementId ScrollStateData::current_native_scrolling_element() const {
   if (current_native_scrolling_node_)
-    return current_native_scrolling_node_->data.element_id;
+    return current_native_scrolling_node_->element_id;
   return current_native_scrolling_element_;
 }
 
 void ScrollStateData::set_current_native_scrolling_element(
     ElementId element_id) {
   current_native_scrolling_element_ = element_id;
   current_native_scrolling_node_ = nullptr;
 }
 
 }  // namespace cc