Cleanup of SkyBinding, and resultant yak shaving.

sky/sdk/lib/rendering/object.dart

 // 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.
 
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 import 'dart:sky' show Point, Size, Rect, Color, Paint, Path;
 
-import '../app/scheduler.dart' as scheduler;
-import '../framework/node.dart';
+import '../sky/hittest.dart';
+import '../sky/scheduler.dart' as scheduler;
+import '../types/node.dart';
 
 export 'dart:sky' show Point, Size, Rect, Color, Paint, Path;
+export '../sky/hittest.dart' show HitTestTarget, HitTestEntry, HitTestResult;
+
 
 class ParentData {
   void detach() {
     detachSiblings();
   }
   void detachSiblings() { } // workaround for lack of inter-class mixins in Dart
   void merge(ParentData other) {
     // override this in subclasses to merge in data from other into this
     assert(other.runtimeType == this.runtimeType);
   }
   String toString() => '<none>';
 }
 
 const kLayoutDirections = 4;
 
 class RenderObjectDisplayList extends sky.PictureRecorder {
   RenderObjectDisplayList(double width, double height) : super(width, height);
   void paintChild(RenderObject child, Point position) {
     translate(position.x, position.y);
     child.paint(this);
     translate(-position.x, -position.y);
   }
 }
 
-abstract class RenderObject extends AbstractNode {
+abstract class RenderObject extends AbstractNode implements HitTestTarget {
 
   // LAYOUT
 
   // parentData is only for use by the RenderObject that actually lays this
   // node out, and any other nodes who happen to know exactly what
   // kind of node that is.
   dynamic parentData; // TODO(ianh): change the type of this back to ParentData once the analyzer is cleverer
   void setParentData(RenderObject child) {
     // override this to setup .parentData correctly for your class
     assert(!debugDoingLayout);
@@ skipping 205 matching lines @@
     if (!attached)
       header += ' DETACHED';
     prefix += '  ';
     return '${header}\n${debugDescribeSettings(prefix)}${debugDescribeChildren(prefix)}';
   }
   String debugDescribeSettings(String prefix) => '${prefix}parentData: ${parentData}\n${prefix}constraints: ${constraints}\n';
   String debugDescribeChildren(String prefix) => '';
 
 }
 
-class HitTestEntry {
-  const HitTestEntry(this.target);
-
-  final RenderObject target;
-}
-
-class HitTestResult {
-  final List<HitTestEntry> path = new List<HitTestEntry>();
-
-  void add(HitTestEntry data) {
-    path.add(data);
-  }
-}
-
 double clamp({ double min: 0.0, double value: 0.0, double max: double.INFINITY }) {
   assert(min != null);
   assert(value != null);
   assert(max != null);
   return math.max(min, math.min(max, value));
 }
 
 
 // GENERIC MIXIN FOR RENDER NODES WITH ONE CHILD
 
@@ skipping 187 matching lines @@
     int count = 1;
     ChildType child = _firstChild;
     while (child != null) {
       result += '${prefix}child ${count}: ${child.toString(prefix)}';
       count += 1;
       child = child.parentData.nextSibling;
     }
     return result;
   }
 }