DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of HitTestChildBlockBackground walk.

Browse Source 
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
This commit is contained in:
Ojan Vafai 2015-02-13 21:05:58 -08:00
parent e240568540
commit 3912ca81ab
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/tests/layout/document-elementFromPoint-expected.txt
View File

@ -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

26
engine/src/flutter/tests/layout/document-elementFromPoint.sky
View File

@ -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>