Rebasline a test + more bug reorganization.

BUG=10398
TEST=green webkit builders

Review URL: http://codereview.chromium.org/178014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24772 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 409 insertions, 34 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.checksum
new file mode 100644
index 0000000..e0faabc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.checksum
@@ -0,0 +1 @@
+4fcc6df06a9f1fdc73f58cff1a7edcf9
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.png
new file mode 100644
index 0000000..97f639f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.txt
new file mode 100644
index 0000000..3d5beea
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/pointer-events-2-expected.txt
@@ -0,0 +1,199 @@
+layer at (0,0) size 785x640
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x175
+  RenderBlock {HTML} at (0,0) size 785x175
+    RenderBody {BODY} at (8,21) size 769x138
+      RenderBlock {H1} at (0,0) size 769x37
+        RenderText {#text} at (0,0) size 761x36
+          text run at (0,0) width 761: "Testing the values of 'pointer-events' on HTML content"
+      RenderBlock {P} at (0,58) size 769x80
+        RenderText {#text} at (0,0) size 734x79
+          text run at (0,0) width 543: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
+          text run at (543,0) width 187: "the elements in the first column,"
+          text run at (0,20) width 308: "making sure the actual result (3rd column) matches "
+          text run at (308,20) width 423: "the expected result (2nd column). Repeat for click target (4th column),"
+          text run at (0,40) width 175: "expected result (5th column) "
+          text run at (175,40) width 496: "and actual result (6th column). Note: You should click on a yellow inline element if "
+          text run at (671,40) width 63: "one exists,"
+          text run at (0,60) width 187: "otherwise anywhere in the box."
+layer at (10,140) size 300x100
+  RenderBlock (positioned) {DIV} at (10,140) size 300x100
+layer at (10,140) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,140) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 68x39
+      text run at (0,0) width 48: "pointer-"
+      text run at (0,20) width 68: "events auto"
+layer at (110,140) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p1"
+layer at (210,140) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p1"
+layer at (10,240) size 300x100
+  RenderBlock (positioned) {DIV} at (10,240) size 300x100
+layer at (10,240) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,240) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 71x39
+      text run at (0,0) width 48: "pointer-"
+      text run at (0,20) width 71: "events none"
+layer at (110,240) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (210,240) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (10,340) size 300x100
+  RenderBlock (positioned) {DIV} at (10,340) size 300x100
+layer at (10,340) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,340) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 69x39
+      text run at (0,0) width 53: "siblings -"
+      text run at (0,20) width 69: "auto on top"
+layer at (10,340) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80
+layer at (110,340) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p4"
+layer at (210,340) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p4"
+layer at (10,440) size 300x100
+  RenderBlock (positioned) {DIV} at (10,440) size 300x100
+layer at (10,440) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,440) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 72x39
+      text run at (0,0) width 53: "siblings -"
+      text run at (0,20) width 72: "none on top"
+layer at (10,440) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80
+layer at (110,440) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p5"
+layer at (210,440) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p5"
+layer at (10,540) size 300x100
+  RenderBlock (positioned) {DIV} at (10,540) size 300x100
+layer at (10,540) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,540) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,540) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 79x39
+      text run at (0,0) width 79: "nested - auto"
+      text run at (0,20) width 31: "outer"
+layer at (110,540) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p7"
+layer at (210,540) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p7"
+layer at (340,140) size 300x100
+  RenderBlock (positioned) {DIV} at (340,140) size 300x100
+layer at (340,140) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,140) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,140) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 64x39
+      text run at (0,0) width 49: "nested -"
+      text run at (0,20) width 64: "none outer"
+layer at (440,140) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p10"
+layer at (540,140) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p10"
+layer at (340,240) size 300x100
+  RenderBlock (positioned) {DIV} at (340,240) size 300x100
+layer at (340,240) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,240) size 80x80
+  RenderImage {IMG} at (0,0) size 80x80
+layer at (440,240) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p11"
+layer at (540,240) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p11"
+layer at (340,340) size 300x100
+  RenderBlock (positioned) {DIV} at (340,340) size 300x100
+layer at (340,340) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,340) size 80x80
+  RenderImage {IMG} at (0,0) size 80x80
+layer at (440,340) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (540,340) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (340,440) size 300x100
+  RenderBlock (positioned) {DIV} at (340,440) size 300x100
+layer at (340,440) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,440) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
+      RenderText {#text} at (0,0) size 30x19
+        text run at (0,0) width 30: "inline"
+    RenderText {#text} at (30,0) size 72x59
+      text run at (30,0) width 24: " has"
+      text run at (0,20) width 72: "auto, parent"
+      text run at (0,40) width 29: "none"
+layer at (440,440) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p14"
+layer at (540,440) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p14"
+layer at (340,540) size 300x100
+  RenderBlock (positioned) {DIV} at (340,540) size 300x100
+layer at (340,540) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,540) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
+      RenderText {#text} at (0,0) size 30x19
+        text run at (0,0) width 30: "inline"
+    RenderText {#text} at (30,0) size 75x59
+      text run at (30,0) width 24: " has"
+      text run at (0,20) width 75: "none, parent"
+      text run at (0,40) width 26: "auto"
+layer at (440,540) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p15"
+layer at (540,540) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p15"
+caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of child 1 {BODY} of child 1 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.checksum
new file mode 100644
index 0000000..f3b59fa
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.checksum
@@ -0,0 +1 @@
+c9010f323e1368a7ff17e668a7aa3588
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.png
new file mode 100644
index 0000000..589798b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.txt
new file mode 100644
index 0000000..3d5beea
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/pointer-events-2-expected.txt
@@ -0,0 +1,199 @@
+layer at (0,0) size 785x640
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x175
+  RenderBlock {HTML} at (0,0) size 785x175
+    RenderBody {BODY} at (8,21) size 769x138
+      RenderBlock {H1} at (0,0) size 769x37
+        RenderText {#text} at (0,0) size 761x36
+          text run at (0,0) width 761: "Testing the values of 'pointer-events' on HTML content"
+      RenderBlock {P} at (0,58) size 769x80
+        RenderText {#text} at (0,0) size 734x79
+          text run at (0,0) width 543: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
+          text run at (543,0) width 187: "the elements in the first column,"
+          text run at (0,20) width 308: "making sure the actual result (3rd column) matches "
+          text run at (308,20) width 423: "the expected result (2nd column). Repeat for click target (4th column),"
+          text run at (0,40) width 175: "expected result (5th column) "
+          text run at (175,40) width 496: "and actual result (6th column). Note: You should click on a yellow inline element if "
+          text run at (671,40) width 63: "one exists,"
+          text run at (0,60) width 187: "otherwise anywhere in the box."
+layer at (10,140) size 300x100
+  RenderBlock (positioned) {DIV} at (10,140) size 300x100
+layer at (10,140) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,140) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 68x39
+      text run at (0,0) width 48: "pointer-"
+      text run at (0,20) width 68: "events auto"
+layer at (110,140) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p1"
+layer at (210,140) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p1"
+layer at (10,240) size 300x100
+  RenderBlock (positioned) {DIV} at (10,240) size 300x100
+layer at (10,240) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,240) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 71x39
+      text run at (0,0) width 48: "pointer-"
+      text run at (0,20) width 71: "events none"
+layer at (110,240) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (210,240) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (10,340) size 300x100
+  RenderBlock (positioned) {DIV} at (10,340) size 300x100
+layer at (10,340) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,340) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 69x39
+      text run at (0,0) width 53: "siblings -"
+      text run at (0,20) width 69: "auto on top"
+layer at (10,340) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80
+layer at (110,340) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p4"
+layer at (210,340) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p4"
+layer at (10,440) size 300x100
+  RenderBlock (positioned) {DIV} at (10,440) size 300x100
+layer at (10,440) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,440) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 72x39
+      text run at (0,0) width 53: "siblings -"
+      text run at (0,20) width 72: "none on top"
+layer at (10,440) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80
+layer at (110,440) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p5"
+layer at (210,440) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p5"
+layer at (10,540) size 300x100
+  RenderBlock (positioned) {DIV} at (10,540) size 300x100
+layer at (10,540) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,540) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (10,540) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 79x39
+      text run at (0,0) width 79: "nested - auto"
+      text run at (0,20) width 31: "outer"
+layer at (110,540) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p7"
+layer at (210,540) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 16x19
+      text run at (0,0) width 16: "p7"
+layer at (340,140) size 300x100
+  RenderBlock (positioned) {DIV} at (340,140) size 300x100
+layer at (340,140) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,140) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,140) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderText {#text} at (0,0) size 64x39
+      text run at (0,0) width 49: "nested -"
+      text run at (0,20) width 64: "none outer"
+layer at (440,140) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p10"
+layer at (540,140) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p10"
+layer at (340,240) size 300x100
+  RenderBlock (positioned) {DIV} at (340,240) size 300x100
+layer at (340,240) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,240) size 80x80
+  RenderImage {IMG} at (0,0) size 80x80
+layer at (440,240) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p11"
+layer at (540,240) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p11"
+layer at (340,340) size 300x100
+  RenderBlock (positioned) {DIV} at (340,340) size 300x100
+layer at (340,340) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,340) size 80x80
+  RenderImage {IMG} at (0,0) size 80x80
+layer at (440,340) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (540,340) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 29x19
+      text run at (0,0) width 29: "none"
+layer at (340,440) size 300x100
+  RenderBlock (positioned) {DIV} at (340,440) size 300x100
+layer at (340,440) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,440) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
+      RenderText {#text} at (0,0) size 30x19
+        text run at (0,0) width 30: "inline"
+    RenderText {#text} at (30,0) size 72x59
+      text run at (30,0) width 24: " has"
+      text run at (0,20) width 72: "auto, parent"
+      text run at (0,40) width 29: "none"
+layer at (440,440) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p14"
+layer at (540,440) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p14"
+layer at (340,540) size 300x100
+  RenderBlock (positioned) {DIV} at (340,540) size 300x100
+layer at (340,540) size 80x80
+  RenderBlock (positioned) {DIV} at (0,0) size 80x80
+layer at (340,540) size 80x80
+  RenderBlock (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
+    RenderInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
+      RenderText {#text} at (0,0) size 30x19
+        text run at (0,0) width 30: "inline"
+    RenderText {#text} at (30,0) size 75x59
+      text run at (30,0) width 24: " has"
+      text run at (0,20) width 75: "none, parent"
+      text run at (0,40) width 26: "auto"
+layer at (440,540) size 80x80
+  RenderBlock (positioned) {DIV} at (100,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p15"
+layer at (540,540) size 80x80
+  RenderBlock (positioned) {DIV} at (200,0) size 80x80
+    RenderText {#text} at (0,0) size 24x19
+      text run at (0,0) width 24: "p15"
+caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of child 1 {BODY} of child 1 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index d013203..a852f27 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -844,6 +844,13 @@ BUG8696 WIN LINUX : LayoutTests/fast/gradients/crash-on-zero-radius.html = FAIL
 BUG10385 : LayoutTests/fast/dom/dom-constructors.html = FAIL
 BUG10387 SKIP : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-loaded-svg.svg = FAIL
 
+BUG10412 WIN LINUX : LayoutTests/fast/table/vertical-align-baseline.html = FAIL
+BUG20505 : LayoutTests/http/tests/misc/SVGFont-delayed-load.html = FAIL
+BUG20507 : LayoutTests/http/tests/uri/resolve-encoding-relative.html = FAIL
+
+BUG10401 : LayoutTests/plugins/npruntime.html = TIMEOUT FAIL
+BUG6735 : LayoutTests/plugins/netscape-throw-exception.html = FAIL
+
 
 // -----------------------------------------------------------------
 // SVG TESTS
@@ -890,12 +897,13 @@ BUG10288 WIN LINUX : LayoutTests/svg/batik/text/verticalText.svg = FAIL
 
 BUG10289 WIN LINUX : LayoutTests/svg/batik/masking/maskRegions.svg = FAIL
 
-
 // Bug in Skia, see https://bugs.webkit.org/show_bug.cgi?id=24534 .
 BUG10291 WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL
 BUG10291 WIN LINUX : LayoutTests/svg/batik/paints/patternRegionA.svg = FAIL
 BUG10291 WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/pservers-pattern-01-b.svg = FAIL
 
+BUG10415 WIN LINUX : LayoutTests/svg/custom/pattern-with-transformation.svg = FAIL
+
 // -----------------------------------------------------------------
 // End SVG Regressions
 // -----------------------------------------------------------------
@@ -1666,21 +1674,10 @@ BUG10396 MAC : LayoutTests/fast/reflections/reflection-overflow-hidden.html = FA
 // Linux's rotated text output looks terrible.
 BUG10397 LINUX : LayoutTests/fast/transforms/transformed-document-element.html = FAIL
 
-// Rebaseline
-BUG10398 : LayoutTests/fast/events/pointer-events-2.html = FAIL
-
 // Merge 39744:39829 - new tests
 // New test. We should fix it, but it doesn't need to block the current release
 BUG10399 MAC : LayoutTests/fast/encoding/char-encoding-mac.html = FAIL
 
-// Merge 39830:39880 - new tests
-// New test. We should fix it, but it doesn't need to block the current release
-BUG10401 : LayoutTests/plugins/npruntime.html = TIMEOUT FAIL
-
-// Merge 39894:39913 - new test.
-// New test. We should fix it, but it doesn't need to block the current release
-BUG6735 : LayoutTests/plugins/netscape-throw-exception.html = FAIL
-
 // Merge 39744:39913? - regressions
 BUG10403 LINUX : LayoutTests/http/tests/misc/uncacheable-script-repeated.html = TIMEOUT PASS
 BUG10403 LINUX : LayoutTests/http/tests/local/stylesheet-and-script-load-order-http.html = TIMEOUT PASS
@@ -1694,11 +1691,6 @@ BUG10405 WIN : LayoutTests/svg/custom/struct-use-09-b.svg = FAIL
 // Passes locally but Text diff fails on the buildbots
 BUG10406 LINUX : LayoutTests/svg/custom/path-getTotalLength.svg = FAIL PASS
 
-// Merge 40059:40086 -- regressions
-// Expectations for this test changed upstream. We should fix this test, but
-// it doesn't need to block the current release
-BUG10407 : LayoutTests/transitions/hang-with-bad-transition-list.html = TIMEOUT FAIL PASS
-
 // Popup-menu doesn't draw in layout tests
 BUG10408 MAC : LayoutTests/fast/forms/menulist-no-overflow.html = FAIL
 
@@ -1709,23 +1701,6 @@ BUG10409 MAC LINUX : LayoutTests/svg/custom/clip-path-units-changes.svg = FAIL
 // intermittent failures on the buildbot
 BUG10411 : LayoutTests/svg/custom/gradient-stop-style-change.svg = FAIL PASS
 
-// The 7th column should not be top aligned.
-// New test. We should fix it, but it doesn't need to block the current release
-BUG10412 WIN LINUX : LayoutTests/fast/table/vertical-align-baseline.html = FAIL
-
-// Merge 40165:40297 -- regressions
-
-// New test. We should fix it, but it doesn't need to block the current release
-BUG10413 : LayoutTests/http/tests/misc/SVGFont-delayed-load.html = FAIL
-// Expectations for this test changed upstream. We should fix this test, but
-// it doesn't need to block the current release
-BUG10413 : LayoutTests/http/tests/uri/resolve-encoding-relative.html = FAIL
-
-
-// Merge 40364:40409 -- new test
-// New test. We should fix it, but it doesn't need to block the current release
-BUG10415 WIN LINUX : LayoutTests/svg/custom/pattern-with-transformation.svg = FAIL
-
 // Merge 40364:40409 -- fails after http://trac.webkit.org/changeset/40379
 // ASSERTs in Debug after this change: http://trac.webkit.org/changeset/40372
 // Likely will be fixed with subsequent merge.