Index: sky/sdk/lib/rendering/object.dart |
diff --git a/sky/sdk/lib/rendering/object.dart b/sky/sdk/lib/rendering/object.dart |
index 2e5080eb0204f97f739536fb8716a6cc0c3066c7..c158ab9e5116d1a5ce7b3ce24ede8ef8fbe4211c 100644 |
--- a/sky/sdk/lib/rendering/object.dart |
+++ b/sky/sdk/lib/rendering/object.dart |
@@ -6,10 +6,13 @@ 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() { |
@@ -34,7 +37,7 @@ class RenderObjectDisplayList extends sky.PictureRecorder { |
} |
} |
-abstract class RenderObject extends AbstractNode { |
+abstract class RenderObject extends AbstractNode implements HitTestTarget { |
// LAYOUT |
@@ -260,20 +263,6 @@ abstract class RenderObject extends AbstractNode { |
} |
-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); |