From 3912ca81ab5addb3dc3f72f08d04040733e61d5d Mon Sep 17 00:00:00 2001
From: Ojan Vafai <ojan@chromium.org>
Date: Fri, 13 Feb 2015 21:05:58 -0800
Subject: [PATCH] Get rid of HitTestChildBlockBackground walk.

I'm not 100% what this was for, but looking at Blink,
it appears that HitTestChildBlockBackground being different
from HitTestBlockBackground had something to do with
multi-column/regions, which we don't have. I believe
this patch doesn't change any behavior.

Also added to the elementFromPoint test in order to
get more test coverage of the hitTesting code.

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/924263002
---
 .../document-elementFromPoint-expected.txt    |  4 ++-
 .../layout/document-elementFromPoint.sky      | 26 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/engine/src/flutter/tests/layout/document-elementFromPoint-expected.txt b/engine/src/flutter/tests/layout/document-elementFromPoint-expected.txt
index ba1c0d2d106..0553acdb3ac 100644
--- a/engine/src/flutter/tests/layout/document-elementFromPoint-expected.txt
+++ b/engine/src/flutter/tests/layout/document-elementFromPoint-expected.txt
@@ -1,6 +1,8 @@
 CONSOLE: unittest-suite-wait-for-done
 CONSOLE: PASS: should hit test
+CONSOLE: PASS: should hit test child and parent
+CONSOLE: PASS: should hit test child with layered parent
 CONSOLE: 
-CONSOLE: All 1 tests passed.
+CONSOLE: All 3 tests passed.
 CONSOLE: unittest-suite-success
 DONE
diff --git a/engine/src/flutter/tests/layout/document-elementFromPoint.sky b/engine/src/flutter/tests/layout/document-elementFromPoint.sky
index 817991a3c85..b08d00a7f3d 100644
--- a/engine/src/flutter/tests/layout/document-elementFromPoint.sky
+++ b/engine/src/flutter/tests/layout/document-elementFromPoint.sky
@@ -1,9 +1,14 @@
 <sky>
 <style>
-foo { width: 100px; height: 100px; background: blue; }
+foo, parent { width: 100px; height: 100px; background: blue; }
 bar { width: 100px; height: 100px; background: purple; }
+parent { display: paragraph; }
+child { background: salmon; }
 </style>
 <foo /><bar />
+<parent>
+  <child>Foo bar</child>
+</parent>
 <script>
 import "../resources/third_party/unittest/unittest.dart";
 import "../resources/unit.dart";
@@ -24,7 +29,24 @@ void main() {
     // z-order (missing, zero, positive and negative)
     expect(document.elementFromPoint(50, 50).tagName, equals('foo'));
     expect(document.elementFromPoint(50, 150).tagName, equals('bar'));
-    expect(document.elementFromPoint(50, 250).tagName, equals('sky'));
+    expect(document.elementFromPoint(150, 50).tagName, equals('sky'));
+  });
+
+  void hitTestWithChildren() {
+    expect(document.elementFromPoint(50, 210).tagName, equals('child'));
+    // Right of the <child> inline.
+    expect(document.elementFromPoint(95, 210).tagName, equals('parent'));
+    // Below the <child> inline.
+    expect(document.elementFromPoint(50, 275).tagName, equals('parent'));
+  }
+
+  test("should hit test child and parent", () {
+    hitTestWithChildren();
+  });
+
+  test("should hit test child with layered parent", () {
+    document.querySelector('parent').style.setProperty("transform", "translate3d(0, 0, 0)");
+    hitTestWithChildren();
   });
 }
 </script>