Reviewed by Dave Harrison.

        - changed layout tests to dump more minimal information about caret and selection

        * kwq/KWQRenderTreeDebug.cpp:
        (nodePosition): Changed name; now does position relative to document.
        (writeSelection): Removed upstream/downstream code and changed format slightly.

        * layout-tests/editing/*-expected.txt: Regenerated in new format.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt b/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt
index 214cc89c15b6abaaca85b75d776d07a6f9660e48..aaef0331a056352cf27781063aebd804680f7183 100644 (file)
--- a/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt
+++ b/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt
@@ -4,7 +4,4 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of  of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of  of root {DIV}
+caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3608430-fix-expected.txt b/LayoutTests/editing/deleting/delete-3608430-fix-expected.txt
index ea8cae340a89e22387c6fe4c89674133b7e4358f..193deac35ecc9a0da76f92b644d72ce46ed4c924 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3608430-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3608430-fix-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 129x28
             text run at (14,14) width 129: "start-deleting"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 0 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt b/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
index 4fc3e6a92fd28726855af659bec7136675ad7443..aa9184589c3ff5f27433933708ebed9863c5379e 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
             text run at (14,70) width 94: " war. We "
             text run at (108,70) width 111: "of that war."
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 5 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 4 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 5 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 4 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3608462-fix-expected.txt b/LayoutTests/editing/deleting/delete-3608462-fix-expected.txt
index 87342b6ad77c619cb8fd7ffda1eb66ba275ebd7f..54b8de2585d4fe552e79b943346a6d8709d03a43 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3608462-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3608462-fix-expected.txt
@@ -15,7 +15,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (90,204) size 105x28
             text run at (90,204) width 105: " conceived"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 5 {IMG} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 4 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 5 {IMG} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 4 {IMG} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt b/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
index 6cfb5ec80c858f676198937bc2053f7ad1fd1b8b..ce8cd44340ecfb56549875053546aa18085a7c71 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
@@ -5,7 +5,4 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-selection is CARET:
-start:      position 0 of child 1 {BR} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {BR} of root {DIV}
+caret: position 0 of child 0 {BR} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt b/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
index 8cc4f31d4baff3ccf3dffe1677cf98dbbaadb6c7..7b20650cd08d0d87c7f7debd752048823a1fbe2d 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (14,42) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt b/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt
index ddc95cdb574a4e6df86ebccf75512c1c044fa364..cd138107452c3903f92af9011112d7bafb69c67d 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
         RenderInline {I} at (0,0) size 40x28
           RenderText {TEXT} at (54,0) size 40x28
             text run at (54,0) width 40: "four"
-selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 1 {B} of child 1 {DIV} of root {BODY}
-upstream:   position 2 of child 1 {TEXT} of child 1 {B} of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 2 {I} of child 1 {DIV} of root {BODY}
+caret: position 2 of child 0 {TEXT} of child 0 {B} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3865854-fix-expected.txt b/LayoutTests/editing/deleting/delete-3865854-fix-expected.txt
index 9c384042f03e2a1625c802798b0fce582d26c6b9..51a645b87f16ba06acd4110cebdd2c298754afbc 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3865854-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3865854-fix-expected.txt
@@ -16,7 +16,4 @@ layer at (0,0) size 800x600
           RenderInline {I} at (0,0) size 40x28
             RenderText {TEXT} at (0,0) size 40x28
               text run at (0,0) width 40: "four"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 1 {B} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 1 {B} of child 2 {DIV} of root {DIV}
-downstream: position 3 of child 1 {TEXT} of child 1 {B} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 0 {B} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3928305-fix-expected.txt b/LayoutTests/editing/deleting/delete-3928305-fix-expected.txt
index 6d67fb3bfd5826b874259fe1f892a9b98043803c..8a6fd8acf4083444acbd56c3f9f2e1e0043363da 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3928305-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3928305-fix-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (14,70) size 756x28
           RenderText {TEXT} at (0,0) size 34x28
             text run at (0,0) width 34: "baz"
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 2 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 2 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-3959464-fix-expected.txt b/LayoutTests/editing/deleting/delete-3959464-fix-expected.txt
index dea5fd1afc48f9573815b81dc77c2a16f76ea7c6..8bac9a9fd09239ea7e0d332852f4916d68d6b332 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3959464-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3959464-fix-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
           RenderBR {BR} at (14,14) size 0x28
         RenderBlock {DIV} at (0,112) size 784x28 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of child 3 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {DIV} of root {DIV}
-downstream: position 1 of child 3 {DIV} of root {DIV}
+caret: position 0 of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-after-span-ws-001-expected.txt b/LayoutTests/editing/deleting/delete-after-span-ws-001-expected.txt
index db28d0e3ab4b29c775492a4d364fc405c074245b..a14950871b1f24168ae4386ddab333957845da6c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-after-span-ws-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-after-span-ws-001-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 34x48
           text run at (106,84) width 34: "baz"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-after-span-ws-002-expected.txt b/LayoutTests/editing/deleting/delete-after-span-ws-002-expected.txt
index db28d0e3ab4b29c775492a4d364fc405c074245b..a14950871b1f24168ae4386ddab333957845da6c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-after-span-ws-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-after-span-ws-002-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 34x48
           text run at (106,84) width 34: "baz"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-after-span-ws-003-expected.txt b/LayoutTests/editing/deleting/delete-after-span-ws-003-expected.txt
index db28d0e3ab4b29c775492a4d364fc405c074245b..a14950871b1f24168ae4386ddab333957845da6c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-after-span-ws-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-after-span-ws-003-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 34x48
           text run at (106,84) width 34: "baz"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-and-undo-expected.txt b/LayoutTests/editing/deleting/delete-and-undo-expected.txt
index 428c1ae99c47862cb76b872f7def1b3253b60b5a..31fc79f283e6b13c7d8e9c69c6606000c18918af 100644 (file)
--- a/LayoutTests/editing/deleting/delete-and-undo-expected.txt
+++ b/LayoutTests/editing/deleting/delete-and-undo-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
           RenderText {TEXT} at (14,14) size 22x28
             text run at (14,14) width 22: "az"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 1 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001-expected.txt
index ecc7fb98de0bf31aedd8e88a09283043b9c8d4f0..04e9e130217811b57c53eaf39715d651368496e4 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001-expected.txt
@@ -28,7 +28,4 @@ layer at (0,0) size 800x600
             RenderBR {BR} at (0,0) size 0x28
           RenderBlock {P} at (2,58) size 780x28
             RenderBR {BR} at (0,0) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 4 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {P} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 4 {P} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 3 {P} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt
index 268e09c5e4ddc922f68819933894d301cd669c99..1271f866786e3f73882179fbe5d3fbd93903b2ec 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt
@@ -29,7 +29,4 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (2,58) size 780x0
           RenderBlock {P} at (2,58) size 780x28
             RenderBR {BR} at (0,0) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 3 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 3 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 2 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt
index 302ff81b8c66cab518415be0e11d1c1345bc30fb..ea44380d8ec53d13f567f78a76f6fcf691f55a76 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt
@@ -27,7 +27,4 @@ layer at (0,0) size 800x600
           RenderBlock {P} at (2,30) size 780x28
             RenderText {TEXT} at (0,0) size 17x28
               text run at (0,0) width 17: "A"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 4 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {P} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 4 {P} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 3 {P} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt
index d9792a6958c0c89a05ba4c4f95a2fc574a4b879c..6fb3f74dfd088f6251aaa88cdf43967fc2edd8e2 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt
@@ -28,7 +28,4 @@ layer at (0,0) size 800x600
           RenderBlock {P} at (2,30) size 780x28
             RenderText {TEXT} at (0,0) size 17x28
               text run at (0,0) width 17: "A"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {P} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 3 {P} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 2 {P} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt
index 65bc6dfe4bcb7e762d01ce2035b6af09e469f1b9..597e119a74a240f65c764432e06a0825207d8a2b 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt
@@ -26,7 +26,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 17: "A"
           RenderBlock (anonymous) at (2,30) size 780x28
             RenderBR {BR} at (0,0) size 0x28
-selection is CARET:
-start:      position 0 of child 3 {BR} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {BR} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {BR} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 2 {BR} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt
index 2c8e6677ba93319adb462443e0422f7b177c384a..a9de04ba70ad4f1b2e45da7c2059e16830cd8a6a 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt
@@ -26,7 +26,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 17: "A"
           RenderBlock {P} at (2,30) size 780x28
             RenderBR {BR} at (0,0) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 4 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {P} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 4 {P} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 3 {P} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt
index 93a9523ed8c325c5eaa15cdd3e2096b4e4021105..d8ac8b5e7f48ee0d99ce9f0151b136ef158a203c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt
@@ -31,7 +31,4 @@ layer at (0,0) size 800x600
           RenderBlock {P} at (2,58) size 780x28
             RenderText {TEXT} at (0,0) size 20x28
               text run at (0,0) width 20: "ur"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 4 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {P} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 4 {P} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 3 {P} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt
index eb51899d73fdff99250611bddfec8740d9071295..e569332e8b05b3156a141a1d5cc221a63d1bcf74 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt
@@ -34,7 +34,4 @@ layer at (0,0) size 800x600
           RenderBlock {P} at (2,86) size 780x28
             RenderText {TEXT} at (0,0) size 20x28
               text run at (0,0) width 20: "fo"
-selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 6 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 6 {P} of child 1 {DIV} of root {DIV}
-downstream: position 2 of child 1 {TEXT} of child 6 {P} of child 1 {DIV} of root {DIV}
+caret: position 2 of child 0 {TEXT} of child 5 {P} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt
index 6f3be3a41e4ccfd4d00a1ad1f96c03b01d45bf35..b4344e5e9fd53824efbd156d440651f6b1c6f554 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt
@@ -31,7 +31,4 @@ layer at (0,0) size 800x600
           RenderBlock {P} at (2,58) size 780x28
             RenderText {TEXT} at (0,0) size 40x28
               text run at (0,0) width 40: "four"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {P} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {P} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 1 {P} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt
index ceeb8a92b6a5b6dc4a27408e178379eb63ae0efb..659d54b5c6c0cad6fdd3d4260aeacc4a65031451 100644 (file)
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt
@@ -47,7 +47,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,118) size 780x28
             RenderText {TEXT} at (0,0) size 114x28
               text run at (0,0) width 114: "cha cha cha"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 5 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 5 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 5 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 4 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-contents-001-expected.txt b/LayoutTests/editing/deleting/delete-block-contents-001-expected.txt
index 214cc89c15b6abaaca85b75d776d07a6f9660e48..aaef0331a056352cf27781063aebd804680f7183 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-contents-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-contents-001-expected.txt
@@ -4,7 +4,4 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of  of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of  of root {DIV}
+caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-contents-002-expected.txt b/LayoutTests/editing/deleting/delete-block-contents-002-expected.txt
index 214cc89c15b6abaaca85b75d776d07a6f9660e48..aaef0331a056352cf27781063aebd804680f7183 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-contents-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-contents-002-expected.txt
@@ -4,7 +4,4 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of  of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of  of root {DIV}
+caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-contents-003-expected.txt b/LayoutTests/editing/deleting/delete-block-contents-003-expected.txt
index 8d33c08fc2bd39ee2103cd802e6a888fae88700d..2b55b7c6272fbbc4a5576f356cd9637abea56d63 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-contents-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-contents-003-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
             text run at (89,14) width 34: "baz"
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of child 3 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-upstream:   position 0 of child 3 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-downstream: position 1 of child 3 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
+caret: position 0 of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt
index 9b1cfb640b7e883484430069ccf78497c049e66e..6a6c228f1268924dc72d292ec01d2325be657d45 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
             text run at (0,0) width 40: "One"
           RenderText {TEXT} at (40,0) size 44x28
             text run at (40,0) width 44: "Two"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt
index 83e52017ca0e7391e3bbd6be22ac9922ce58744b..8887ec9ac6994279bd0921851ed926f61c9b9d27 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (0,28) size 57x28
             text run at (0,28) width 57: "Three"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-003-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-003-expected.txt
index 83e52017ca0e7391e3bbd6be22ac9922ce58744b..8887ec9ac6994279bd0921851ed926f61c9b9d27 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-003-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (0,28) size 57x28
             text run at (0,28) width 57: "Three"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt
index 83e52017ca0e7391e3bbd6be22ac9922ce58744b..8887ec9ac6994279bd0921851ed926f61c9b9d27 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (0,28) size 57x28
             text run at (0,28) width 57: "Three"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-005-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-005-expected.txt
index e36d231ae28b22474e5f26c55ff4ecc3f7972c6b..2385cc6fb654eea18dbee3c69a5d5c978181dabd 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-005-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-005-expected.txt
@@ -16,7 +16,4 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (0,56) size 756x28
             RenderText {TEXT} at (0,0) size 45x28
               text run at (0,0) width 45: "Four"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-006-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-006-expected.txt
index 6535e7876ff3d7df10e94dc1a0c686510979196c..2621d2eebd5cdf33752d288dbdb3de6c97ea24d6 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-006-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-006-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (0,56) size 756x28
             RenderText {TEXT} at (0,0) size 45x28
               text run at (0,0) width 45: "Four"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-007-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-007-expected.txt
index 69990a92533703b29287b82fbd5fda0612fbc2bf..71e6650c04619612311e3d5fcc1b8dc6216dcb20 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-007-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-007-expected.txt
@@ -19,7 +19,4 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (0,56) size 756x28
             RenderText {TEXT} at (0,0) size 45x28
               text run at (0,0) width 45: "Four"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt
index 8e1abccb36d767a04aeb44e9378c77679283aedc..dcc1153bb2afc34cc779623aa5289b68b01b30e1 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt
@@ -16,7 +16,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (0,56) size 756x28
             RenderText {TEXT} at (0,0) size 45x28
               text run at (0,0) width 45: "Four"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-009-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-009-expected.txt
index e35dd951a086a2fb18d39e0b19dc28a71bef2526..8c28174c3c07224285610b8ff924d6ba5fbd04ed 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-009-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-009-expected.txt
@@ -19,7 +19,4 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (0,84) size 756x28
             RenderText {TEXT} at (0,0) size 43x28
               text run at (0,0) width 43: "Five"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-010-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-010-expected.txt
index bcf0770b6bd2862366d475c1de855f69bbce9ee1..761d8d4697cd37b0a57ccc47227ef206728855c9 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-010-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-010-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
             text run at (84,0) width 57: "Three"
           RenderText {TEXT} at (141,0) size 45x28
             text run at (141,0) width 45: "Four"
-selection is CARET:
-start:      position 5 of child 3 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 5 of child 3 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 5 of child 2 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-011-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-011-expected.txt
index 50659adc3a54dfb025b9d72039d7cf96d50f6ca3..e7e153f212ecf0c30e92488eaab553f8ba4e393f 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-011-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-011-expected.txt
@@ -16,7 +16,4 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (0,84) size 756x28
             RenderText {TEXT} at (0,0) size 57x28
               text run at (0,0) width 57: "Three"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-012-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-012-expected.txt
index ae3afe6195e6ecf65f17d1debe6631fa0ddbf89d..fef56ad2eaf1c1727fbf9849d90b654e2e225769 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-012-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-012-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 71: "This is "
             RenderText {TEXT} at (71,0) size 106x28
               text run at (71,0) width 106: " some text."
-selection is CARET:
-start:      position 8 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-upstream:   position 8 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
+caret: position 8 of child 0 {TEXT} of child 0 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-013-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-013-expected.txt
index cdeb028a648a7ef9cfa8da9a3927c3de6a65e5e9..12b1fdd372a3c60cbc8f86a636c8a6a1147adfad 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-013-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-013-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 71: "This is "
             RenderText {TEXT} at (71,0) size 100x28
               text run at (71,0) width 100: "some text."
-selection is CARET:
-start:      position 8 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-upstream:   position 8 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
+caret: position 8 of child 0 {TEXT} of child 0 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-014-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-014-expected.txt
index c2fa680355c0c7b20b389de29c36a646bf408872..b7a20e2463517017eb4c85953e728f43c59df6a9 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-014-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-014-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 65: "This is"
             RenderText {TEXT} at (65,0) size 106x28
               text run at (65,0) width 106: " some text."
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-upstream:   position 7 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
+caret: position 7 of child 0 {TEXT} of child 0 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-015-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-015-expected.txt
index c2fa680355c0c7b20b389de29c36a646bf408872..b7a20e2463517017eb4c85953e728f43c59df6a9 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-015-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-015-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 65: "This is"
             RenderText {TEXT} at (65,0) size 106x28
               text run at (65,0) width 106: " some text."
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-upstream:   position 7 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
+caret: position 7 of child 0 {TEXT} of child 0 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-016-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-016-expected.txt
index c2fa680355c0c7b20b389de29c36a646bf408872..b7a20e2463517017eb4c85953e728f43c59df6a9 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-016-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-016-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 65: "This is"
             RenderText {TEXT} at (65,0) size 106x28
               text run at (65,0) width 106: " some text."
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-upstream:   position 7 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
+caret: position 7 of child 0 {TEXT} of child 0 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-017-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-017-expected.txt
index ae3afe6195e6ecf65f17d1debe6631fa0ddbf89d..fef56ad2eaf1c1727fbf9849d90b654e2e225769 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-017-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-017-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 71: "This is "
             RenderText {TEXT} at (71,0) size 106x28
               text run at (71,0) width 106: " some text."
-selection is CARET:
-start:      position 8 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-upstream:   position 8 of child 1 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of child 2 {DIV} of root {DIV}
+caret: position 8 of child 0 {TEXT} of child 0 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-018-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-018-expected.txt
index b5c9319cd6c3f5c5279bab851bd8fa6a01b5d6a7..0a5bb8d0ae415d5050ec7d3a29dc9b2697a2bb8a 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-018-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-018-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
             RenderText {TEXT} at (14,14) size 111x28
               text run at (14,14) width 111: "...more text"
-selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 2 of child 0 {TEXT} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-019-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-019-expected.txt
index 843bc3c66e008c6eb8280aa53d9cb2f6512605eb..9e9949f8ca050e01c776d96a1a5074e5a85977e0 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-019-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-019-expected.txt
@@ -14,7 +14,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
             RenderText {TEXT} at (14,14) size 17x28
               text run at (14,14) width 17: "X"
-selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 2 of child 0 {TEXT} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-020-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-020-expected.txt
index 54969ff779f2133d800b1942fc66ed3d6b0affec..5e7653710d7bc9761459847957d818f072ce8f94 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-020-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-020-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
             text run at (14,14) width 17: "X"
           RenderText {TEXT} at (31,14) size 17x28
             text run at (31,14) width 17: "X"
-selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 2 of child 0 {TEXT} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-021-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-021-expected.txt
index 650a18d19e337491f8fa45abd5a10abf1f8509df..862d9445a75cbdf124345abe2c66f280bbe85340 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-021-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-021-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
             RenderText {TEXT} at (14,14) size 34x28
               text run at (14,14) width 34: "XX"
-selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 2 of child 0 {TEXT} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-001-expected.txt b/LayoutTests/editing/deleting/delete-br-001-expected.txt
index ef273ae1e42cd6be2d01cc9c0cd82639ca56c938..4b1bf524f6baf017df27f792693b5fffe7021961 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-001-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (218,14) size 92x28
             text run at (218,14) width 92: "years ago"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 23 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 23 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 23 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-002-expected.txt b/LayoutTests/editing/deleting/delete-br-002-expected.txt
index bcabc55f9a5449f5b9b360224d5895721c668bf0..edea00e243bc509c45e05f737de222146e898b71 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-002-expected.txt
@@ -14,7 +14,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 92x28
             text run at (14,70) width 92: "years ago"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 3 {BR} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 2 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {BR} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 2 {BR} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-003-expected.txt b/LayoutTests/editing/deleting/delete-br-003-expected.txt
index 210a1b7c35c2dcdc38f6150be8a569a82344bf5c..89924a8785279c270d3b21aa4de3b70645c45f20 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-003-expected.txt
@@ -14,7 +14,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 92x28
             text run at (14,70) width 92: "years ago"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 23 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 23 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {BR} of child 2 {SPAN} of root {DIV}
+caret: position 23 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-004-expected.txt b/LayoutTests/editing/deleting/delete-br-004-expected.txt
index 5f984d29ed033ee3431e865f9ce73f8b2586f6d7..c436c7b7c1d57ee06d00438c65958ed0a68885f7 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-004-expected.txt
@@ -14,7 +14,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 92x28
             text run at (14,70) width 92: "years ago"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 4 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 3 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-005-expected.txt b/LayoutTests/editing/deleting/delete-br-005-expected.txt
index 360b5177a718d5d5e1015f785d5e8f2296b4fb37..b620e84463e25e2cf04f839ccab2cc1e59f932a6 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-005-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-005-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 92x28
             text run at (14,42) width 92: "years ago"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 2 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-006-expected.txt b/LayoutTests/editing/deleting/delete-br-006-expected.txt
index 0c3eabe4102e48d7f848e77f4ccb111b7811f3be..89f6829aa0563932a4d3ed6b50b0b0bd7005eba4 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-006-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-006-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (218,14) size 92x28
             text run at (218,14) width 92: "years ago"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 23 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 23 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 23 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-007-expected.txt b/LayoutTests/editing/deleting/delete-br-007-expected.txt
index 8a5d56c83b4825fe6626b455664d1be90b7f3f5b..0394707a3c9c5bf91de50cab223f538eba1c4617 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-007-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-007-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (212,14) size 92x28
             text run at (212,14) width 92: "years ago"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 22 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 22 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 22 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-008-expected.txt b/LayoutTests/editing/deleting/delete-br-008-expected.txt
index 88570621e7089df6ff9727cfb34661c9cf9cbfeb..e43e9b20c30c4aa9ae7212bd9d5126896c8016de 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-008-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-008-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 44x28
           text run at (14,14) width 44: "Two"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 3 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-009-expected.txt b/LayoutTests/editing/deleting/delete-br-009-expected.txt
index 424f894dffdb17af645a918974c5e0ee82f9a09f..7dc9d1339fb4b3dc51083cfeac1e9d0c0287656e 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-009-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-009-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 44x28
           text run at (14,14) width 44: "Two"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 0 of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-br-010-expected.txt b/LayoutTests/editing/deleting/delete-br-010-expected.txt
index a681a5c616ee3aae5c132f1c093189ff7b095ca1..b3d3d851e9ae692ebae804e7b97025b6673ab1e7 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-010-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-010-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (54,14) size 44x28
           text run at (54,14) width 44: "Two"
       RenderBlock (anonymous) at (0,56) size 784x0
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 3 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-character-001-expected.txt b/LayoutTests/editing/deleting/delete-character-001-expected.txt
index 216d78b49ec0c8758c3aef668aeea4f1dc4cb4f4..9649139f1a0f5e39e290ac8b8d9662f36f8a6838 100644 (file)
--- a/LayoutTests/editing/deleting/delete-character-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-character-001-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
             text run at (40,14) width 37: "bar "
             text run at (77,14) width 34: "baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-contiguous-ws-001-expected.txt b/LayoutTests/editing/deleting/delete-contiguous-ws-001-expected.txt
index 305c95b91461d9dacf344b84dc4586c1a76576d3..a871953bbecfd630515ea98939e1921d701bacf1 100644 (file)
--- a/LayoutTests/editing/deleting/delete-contiguous-ws-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-contiguous-ws-001-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 78x28
             text run at (14,14) width 78: "foo  baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-image-001-expected.txt b/LayoutTests/editing/deleting/delete-image-001-expected.txt
index a0b9036495fa958fa5d1ba682a7c3e07e8efdbd2..6e67d7c8980e7a3b7b3471ecd23e2de3159be576 100644 (file)
--- a/LayoutTests/editing/deleting/delete-image-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-image-001-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
             text run at (14,204) width 61: "nation"
           RenderImage {IMG} at (75,123) size 76x103
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-image-002-expected.txt b/LayoutTests/editing/deleting/delete-image-002-expected.txt
index 444d48a864096c3a53e577c192f702900664c2e8..e22b771b86867459b1255d72c868981595174747 100644 (file)
--- a/LayoutTests/editing/deleting/delete-image-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-image-002-expected.txt
@@ -23,7 +23,4 @@ layer at (0,0) size 800x600
             text run at (14,232) width 61: "nation"
           RenderImage {IMG} at (75,151) size 76x103
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-image-003-expected.txt b/LayoutTests/editing/deleting/delete-image-003-expected.txt
index dd7a879e40984edcc4510a7ec4d26f2ad9eb8b04..413beeaa7175dde0c89f4f5ccbd95695a85dfea5 100644 (file)
--- a/LayoutTests/editing/deleting/delete-image-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-image-003-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
             text run at (14,14) width 11: "a"
           RenderText {TEXT} at (25,14) size 74x28
             text run at (25,14) width 74: " lincoln"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-image-004-expected.txt b/LayoutTests/editing/deleting/delete-image-004-expected.txt
index 214cc89c15b6abaaca85b75d776d07a6f9660e48..aaef0331a056352cf27781063aebd804680f7183 100644 (file)
--- a/LayoutTests/editing/deleting/delete-image-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-image-004-expected.txt
@@ -4,7 +4,4 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of  of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of  of root {DIV}
+caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-leading-ws-001-expected.txt b/LayoutTests/editing/deleting/delete-leading-ws-001-expected.txt
index 9f396d5ae2c10fc5c9dd20c63ae2a7119eaafd55..5d5071eb2c256047a4d01039a9780e7cd8be6571 100644 (file)
--- a/LayoutTests/editing/deleting/delete-leading-ws-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-leading-ws-001-expected.txt
@@ -7,7 +7,4 @@ layer at (0,0) size 800x600
         RenderInline {SPAN} at (0,0) size 14x28
           RenderText {TEXT} at (14,14) size 14x28
             text run at (14,14) width 14: "f "
-selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 2 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 2 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-001-expected.txt b/LayoutTests/editing/deleting/delete-line-001-expected.txt
index c87a137c184e74aff0c071ba336e4338b9ffb14e..4d5fd093fdeb90fcd9a61ce30236af2918c35c7c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-001-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 600x28
         RenderText {TEXT} at (0,0) size 197x28
           text run at (0,0) width 197: "in the affairs of men"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-002-expected.txt b/LayoutTests/editing/deleting/delete-line-002-expected.txt
index c87a137c184e74aff0c071ba336e4338b9ffb14e..4d5fd093fdeb90fcd9a61ce30236af2918c35c7c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-002-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 600x28
         RenderText {TEXT} at (0,0) size 197x28
           text run at (0,0) width 197: "in the affairs of men"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-003-expected.txt b/LayoutTests/editing/deleting/delete-line-003-expected.txt
index ae79c34ff9fc853f6be7aa9545c40f2a6d453f28..d107673b3b003401dc1ceae473c4eacc3b9d82dd 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-003-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,0) size 0x0
         RenderText {TEXT} at (0,28) size 241x28
           text run at (0,28) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 3 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 1 of child 2 {BR} of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 2 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-004-expected.txt b/LayoutTests/editing/deleting/delete-line-004-expected.txt
index bea14af5a861eac43c00b649931025fd109bf255..4b0d130df9e3eb1fc9eccd66ea2bed27c2f7a82a 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-004-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,28) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 0 of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-005-expected.txt b/LayoutTests/editing/deleting/delete-line-005-expected.txt
index a893f3e0b9b12420da80dbbf7a8340ad80fdb29f..71428407e830ccc3969035b4efaef3873fff96be 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-005-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-005-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-006-expected.txt b/LayoutTests/editing/deleting/delete-line-006-expected.txt
index a893f3e0b9b12420da80dbbf7a8340ad80fdb29f..71428407e830ccc3969035b4efaef3873fff96be 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-006-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-006-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-007-expected.txt b/LayoutTests/editing/deleting/delete-line-007-expected.txt
index a893f3e0b9b12420da80dbbf7a8340ad80fdb29f..71428407e830ccc3969035b4efaef3873fff96be 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-007-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-007-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-008-expected.txt b/LayoutTests/editing/deleting/delete-line-008-expected.txt
index a893f3e0b9b12420da80dbbf7a8340ad80fdb29f..71428407e830ccc3969035b4efaef3873fff96be 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-008-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-008-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-009-expected.txt b/LayoutTests/editing/deleting/delete-line-009-expected.txt
index 90c641aaea0ad0e9f90502c6f723395ea9b3779f..4ecb9c621d2a044d3fd00e157c22f075f9b381ca 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-009-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-009-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,28) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-010-expected.txt b/LayoutTests/editing/deleting/delete-line-010-expected.txt
index 6187de8bb01cea86260f9c99e1d26f81871e8dc8..1e813356eb6262d5c14571ee001ffc82b0540cea 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-010-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-010-expected.txt
@@ -7,7 +7,4 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,0) size 0x28
         RenderText {TEXT} at (0,28) size 241x28
           text run at (0,28) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-011-expected.txt b/LayoutTests/editing/deleting/delete-line-011-expected.txt
index 517db84d068c94b2531c11c00f1703001b2e5f43..bf588fed319f954f28def15d9924fb5446679fbf 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-011-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-011-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,28) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 10 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 10 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-downstream: position 10 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 10 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-012-expected.txt b/LayoutTests/editing/deleting/delete-line-012-expected.txt
index 517db84d068c94b2531c11c00f1703001b2e5f43..bf588fed319f954f28def15d9924fb5446679fbf 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-012-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-012-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,28) size 600x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 10 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 10 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-downstream: position 10 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 10 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-013-expected.txt b/LayoutTests/editing/deleting/delete-line-013-expected.txt
index 746f30978f9e94d9faa67a590bf89d3792aab318..edccda53def65b49e4edaf32b5ccf4f06298a825 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-013-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-013-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 15 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 15 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-downstream: position 15 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 15 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-014-expected.txt b/LayoutTests/editing/deleting/delete-line-014-expected.txt
index 75ab8412e41865dc6ff14c776f0a812454f15fc1..d8abbc7f2e7dc2a5a1c108310d40567171cfd61d 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-014-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-014-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-015-expected.txt b/LayoutTests/editing/deleting/delete-line-015-expected.txt
index baae299cc77e580672e85ade7f5026a54f0e252e..35f2076f3f9085310d9e52f44d9018e05492e12f 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-015-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-015-expected.txt
@@ -14,7 +14,4 @@ layer at (0,0) size 800x600
             text run at (0,0) width 7: "a"
         RenderBlock (anonymous) at (0,18) size 784x18
           RenderBR {BR} at (0,0) size 0x18
-selection is CARET:
-start:      position 0 of child 2 {BR} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-upstream:   position 0 of child 2 {BR} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-downstream: position 0 of child 2 {BR} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
+caret: position 0 of child 1 {BR} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-016-expected.txt b/LayoutTests/editing/deleting/delete-line-016-expected.txt
index 24ab7acfc0cde3c8c81a25cc4cf8e277cb07c46f..edf10a06ecdef803a00f99d2a3cdcf9dbc477b90 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-016-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-016-expected.txt
@@ -14,7 +14,4 @@ layer at (0,0) size 800x600
             text run at (0,0) width 7: "a"
         RenderBlock (anonymous) at (0,18) size 784x18
           RenderBR {BR} at (0,0) size 0x18
-selection is CARET:
-start:      position 0 of child 2 {BR} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-upstream:   position 0 of child 2 {BR} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-downstream: position 0 of child 2 {BR} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
+caret: position 0 of child 1 {BR} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-017-expected.txt b/LayoutTests/editing/deleting/delete-line-017-expected.txt
index 164c8bc9916a42b85194c8b1a5854f32d12b56cb..030f3dcb40d9812574e250190a66bd3be65cd692 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-017-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-017-expected.txt
@@ -15,7 +15,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,18) size 784x18
           RenderText {TEXT} at (0,0) size 8x18
             text run at (0,0) width 8: "b"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-upstream:   position 0 of child 2 {DIV} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-end-ws-001-expected.txt b/LayoutTests/editing/deleting/delete-line-end-ws-001-expected.txt
index a665a4fa009f8046fcfdbaf0ee7ce7850444cca7..b98694d6d5e953d2ba81b04efc9b572e747088ff 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-end-ws-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-end-ws-001-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 540: "Fourscore and seven years ago our fathers brought forth"
             text run at (74,132) width 304: "onthis continent a new nation..."
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 58 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 58 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 58 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 58 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-line-end-ws-002-expected.txt b/LayoutTests/editing/deleting/delete-line-end-ws-002-expected.txt
index a665a4fa009f8046fcfdbaf0ee7ce7850444cca7..b98694d6d5e953d2ba81b04efc9b572e747088ff 100644 (file)
--- a/LayoutTests/editing/deleting/delete-line-end-ws-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-line-end-ws-002-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 540: "Fourscore and seven years ago our fathers brought forth"
             text run at (74,132) width 304: "onthis continent a new nation..."
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 58 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 58 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 58 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 58 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-select-all-001-expected.txt b/LayoutTests/editing/deleting/delete-select-all-001-expected.txt
index 094524ffa84c58c0761506c4fbb11e884441d255..413c248a8a0e97d8b71ec93fab5d7ad430456e9b 100644 (file)
--- a/LayoutTests/editing/deleting/delete-select-all-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-select-all-001-expected.txt
@@ -4,7 +4,4 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x28 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of  of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of child 2 {TEXT} of root {DIV}
+caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-select-all-002-expected.txt b/LayoutTests/editing/deleting/delete-select-all-002-expected.txt
index 214cc89c15b6abaaca85b75d776d07a6f9660e48..aaef0331a056352cf27781063aebd804680f7183 100644 (file)
--- a/LayoutTests/editing/deleting/delete-select-all-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-select-all-002-expected.txt
@@ -4,7 +4,4 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of  of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of  of root {DIV}
+caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-select-all-003-expected.txt b/LayoutTests/editing/deleting/delete-select-all-003-expected.txt
index 094524ffa84c58c0761506c4fbb11e884441d255..413c248a8a0e97d8b71ec93fab5d7ad430456e9b 100644 (file)
--- a/LayoutTests/editing/deleting/delete-select-all-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-select-all-003-expected.txt
@@ -4,7 +4,4 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x28 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of  of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of child 2 {TEXT} of root {DIV}
+caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-selection-001-expected.txt b/LayoutTests/editing/deleting/delete-selection-001-expected.txt
index 55ace4b54ec0645285e257fab8e39a1c47cf2111..72f8fdd3d39d4c694eac42286e49fa000c812f7f 100644 (file)
--- a/LayoutTests/editing/deleting/delete-selection-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-selection-001-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
             text run at (14,14) width 43: " bar "
             text run at (57,14) width 34: "baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 0 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-tab-001-expected.txt b/LayoutTests/editing/deleting/delete-tab-001-expected.txt
index e6160cbb73a7e0d328ed2e3fe195d83cc8b3fe14..689938cea00fb00c47162ef4762e083559ae63fb 100644 (file)
--- a/LayoutTests/editing/deleting/delete-tab-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-tab-001-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 56x28
             text run at (14,14) width 56: "    foo"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-tab-002-expected.txt b/LayoutTests/editing/deleting/delete-tab-002-expected.txt
index c35ba45969574daf37a599ebe1c112c8afb5b5e8..2eb981df564e6a13521cfaec1118835748f5029a 100644 (file)
--- a/LayoutTests/editing/deleting/delete-tab-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-tab-002-expected.txt
@@ -7,7 +7,4 @@ layer at (0,0) size 800x600
         RenderInline {SPAN} at (0,0) size 56x28
           RenderText {TEXT} at (14,14) size 56x28
             text run at (14,14) width 56: "foo    "
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 7 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 7 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 7 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-tab-003-expected.txt b/LayoutTests/editing/deleting/delete-tab-003-expected.txt
index 6308092c57b849a81b30f3e08e3a9f7e693d61b8..594a8503448c64c6cf1a4b8109931b5f89237a73 100644 (file)
--- a/LayoutTests/editing/deleting/delete-tab-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-tab-003-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 56x28
             text run at (14,14) width 56: "fo    o"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 6 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 6 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 6 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 6 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-tab-004-expected.txt b/LayoutTests/editing/deleting/delete-tab-004-expected.txt
index 9080dafc118659ee1a8d0c87402b5fe60988d627..5036493e6dc0a71ac9cbe9dba348ebd101364c21 100644 (file)
--- a/LayoutTests/editing/deleting/delete-tab-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-tab-004-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 56x28
             text run at (14,42) width 56: "    foo"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 4 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 1 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-trailing-ws-001-expected.txt b/LayoutTests/editing/deleting/delete-trailing-ws-001-expected.txt
index 55ace4b54ec0645285e257fab8e39a1c47cf2111..72f8fdd3d39d4c694eac42286e49fa000c812f7f 100644 (file)
--- a/LayoutTests/editing/deleting/delete-trailing-ws-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-trailing-ws-001-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
             text run at (14,14) width 43: " bar "
             text run at (57,14) width 34: "baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 0 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-trailing-ws-002-expected.txt b/LayoutTests/editing/deleting/delete-trailing-ws-002-expected.txt
index 17ea8aa51bbbf316956d2954007eefe39f6a2fc8..08d111d9b4a683328819ec60220a7155b4994fff 100644 (file)
--- a/LayoutTests/editing/deleting/delete-trailing-ws-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-trailing-ws-002-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 40x28
             text run at (14,42) width 40: " baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 2 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-ws-fixup-001-expected.txt b/LayoutTests/editing/deleting/delete-ws-fixup-001-expected.txt
index 2871c1de911fa7085f5a0178c2c018ad145918df..8f9189907a48bfc0d31d6c445da13f42b7f196df 100644 (file)
--- a/LayoutTests/editing/deleting/delete-ws-fixup-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-ws-fixup-001-expected.txt
@@ -22,7 +22,4 @@ layer at (0,0) size 800x600
             text run at (14,42) width 232: "conceived    in Liberty, "
             text run at (246,42) width 386: "and dedicated to the proposition that all"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 7 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 7 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 4 {B} of child 2 {SPAN} of root {DIV}
+caret: position 7 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-ws-fixup-002-expected.txt b/LayoutTests/editing/deleting/delete-ws-fixup-002-expected.txt
index 6079ba2cfe4a6efabf8f3e58e437f03b36de6c49..6ec21006f3f35fedc1e1fde7193e3e3088ea245c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-ws-fixup-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-ws-fixup-002-expected.txt
@@ -22,7 +22,4 @@ layer at (0,0) size 800x600
             text run at (14,42) width 232: "conceived    in Liberty, "
             text run at (246,42) width 386: "and dedicated to the proposition that all"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 7 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 7 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 4 {B} of child 2 {SPAN} of root {DIV}
+caret: position 7 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-ws-fixup-003-expected.txt b/LayoutTests/editing/deleting/delete-ws-fixup-003-expected.txt
index 9643366df52fb5b29cd870fd06bc9420446f76c5..056bd2a010acec7918786c2ca4c185aa0184516b 100644 (file)
--- a/LayoutTests/editing/deleting/delete-ws-fixup-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-ws-fixup-003-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (57,14) size 32x28
             text run at (57,14) width 32: "foo"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {SPAN} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/delete-ws-fixup-004-expected.txt b/LayoutTests/editing/deleting/delete-ws-fixup-004-expected.txt
index 25d7b3f10b188a531cc44489a6aaab629784f4e8..83c21f94aef14888c9ccc5d70ff4cf3b58c4ae3c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-ws-fixup-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-ws-fixup-004-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (69,14) size 32x28
             text run at (69,14) width 32: "foo"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {SPAN} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/forward-delete-expected.txt b/LayoutTests/editing/deleting/forward-delete-expected.txt
index 2f9d2eca54ca6d5c5b3e2fd2c29c60be50a67956..6c05c1b802cfa5bc3f311c7e946a6cba183272db 100644 (file)
--- a/LayoutTests/editing/deleting/forward-delete-expected.txt
+++ b/LayoutTests/editing/deleting/forward-delete-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
           RenderText {TEXT} at (14,14) size 31x28
             text run at (14,14) width 31: "bar"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/smart-delete-001-expected.txt b/LayoutTests/editing/deleting/smart-delete-001-expected.txt
index 38d1a7f09b0907230ffdb3e192fd2c552769c6d7..9a1f48466fe4ee1e92c487a3ef0188adac2ef4e7 100644 (file)
--- a/LayoutTests/editing/deleting/smart-delete-001-expected.txt
+++ b/LayoutTests/editing/deleting/smart-delete-001-expected.txt
@@ -24,7 +24,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)]
           RenderText {TEXT} at (2,2) size 71x28
             text run at (2,2) width 71: "bar baz"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/deleting/smart-delete-002-expected.txt b/LayoutTests/editing/deleting/smart-delete-002-expected.txt
index 619301c93f70a0f5880b7bfdc2b08ede84a1b54a..359c43a4fb895529d3a34d27a239b7ae7c736373 100644 (file)
--- a/LayoutTests/editing/deleting/smart-delete-002-expected.txt
+++ b/LayoutTests/editing/deleting/smart-delete-002-expected.txt
@@ -24,7 +24,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)]
           RenderText {TEXT} at (2,2) size 72x28
             text run at (2,2) width 72: "foo baz"
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 4 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/execCommand/boldSelection-expected.txt b/LayoutTests/editing/execCommand/boldSelection-expected.txt
index b4611b5e334b45cefa955c95fb595e0613b09787..174345a894b3d28c06d15537bf8c3bcc1153750e 100644 (file)
--- a/LayoutTests/editing/execCommand/boldSelection-expected.txt
+++ b/LayoutTests/editing/execCommand/boldSelection-expected.txt
@@ -78,10 +78,5 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (14,342) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 1 {B} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {B} of child 2 {SPAN} of root {DIV}
-end:        position 1 of child 21 {TEXT} of child 1 {B} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 21 {TEXT} of child 1 {B} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 0 {B} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 20 {TEXT} of child 0 {B} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/execCommand/italicizeByCharacter-expected.txt b/LayoutTests/editing/execCommand/italicizeByCharacter-expected.txt
index 1910f8a1d803f2cba7c87e4bc06208d151c9f6af..405f7381c31539433a4972ae7a32adb54e4f7ac6 100644 (file)
--- a/LayoutTests/editing/execCommand/italicizeByCharacter-expected.txt
+++ b/LayoutTests/editing/execCommand/italicizeByCharacter-expected.txt
@@ -38,10 +38,5 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (14,342) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-end:        position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 0 {I} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 0 {TEXT} of child 0 {I} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/execCommand/modifyForeColorByCharacter-expected.txt b/LayoutTests/editing/execCommand/modifyForeColorByCharacter-expected.txt
index d0aa8d39e053e07a89e07a455aa24c618452d1f0..d172b832bcebbedf9a6e04ee695a3a9441808cbf 100644 (file)
--- a/LayoutTests/editing/execCommand/modifyForeColorByCharacter-expected.txt
+++ b/LayoutTests/editing/execCommand/modifyForeColorByCharacter-expected.txt
@@ -38,10 +38,5 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (14,342) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 1 {FONT} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {FONT} of child 2 {SPAN} of root {DIV}
-end:        position 1 of child 1 {TEXT} of child 1 {FONT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 1 {FONT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 0 {FONT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 0 {TEXT} of child 0 {FONT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/execCommand/print-expected.txt b/LayoutTests/editing/execCommand/print-expected.txt
index cef0dace29d64e787f8b82173750d42692f76a3a..1cf36993e020dfe7163772a34ce1c21765702d79 100644 (file)
--- a/LayoutTests/editing/execCommand/print-expected.txt
+++ b/LayoutTests/editing/execCommand/print-expected.txt
@@ -35,7 +35,4 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (14,342) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/execCommand/selectAll-expected.txt b/LayoutTests/editing/execCommand/selectAll-expected.txt
index a0e99ad9abc7632ffa9db45fd8e3dbde475f7b55..13e15b67421ad88e7905bf176dec6c489682edd7 100644 (file)
--- a/LayoutTests/editing/execCommand/selectAll-expected.txt
+++ b/LayoutTests/editing/execCommand/selectAll-expected.txt
@@ -35,10 +35,5 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (14,342) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-end:        position 562 of child 1 {TEXT} of child 2 {P} of child 2 {SPAN} of root {DIV}
-upstream:   position 562 of child 1 {TEXT} of child 2 {P} of child 2 {SPAN} of root {DIV}
-downstream: position 563 of child 1 {TEXT} of child 2 {P} of child 2 {SPAN} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 562 of child 0 {TEXT} of child 1 {P} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt b/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt
index 3cefd27b6dfd84764d14bd56cc19a92fa4257861..5ce3fc814f547873a97004b26195e827a5de9aa5 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt
@@ -7,7 +7,4 @@ layer at (0,0) size 800x600
       RenderText {TEXT} at (14,42) size 36x28
         text run at (14,42) width 36: "xxx"
       RenderBR {BR} at (0,0) size 0x0
-selection is CARET:
-start:      position 3 of child 3 {TEXT} of root {BODY}
-upstream:   position 3 of child 3 {TEXT} of root {BODY}
-downstream: position 0 of child 4 {BR} of root {BODY}
+caret: position 3 of child 2 {TEXT} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt b/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt
index 6ac228a8291a6eedd4f9ded14f352b614f9f91fc..fe34dc106860050235aef428080d3040288ed504 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
               text run at (14,42) width 36: "xxx"
             RenderBR {BR} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 3 of child 3 {TEXT} of child 1 {B} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 3 {TEXT} of child 1 {B} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {BR} of child 1 {B} of child 2 {SPAN} of root {DIV}
+caret: position 3 of child 2 {TEXT} of child 0 {B} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt b/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt
index 0ebe4539a2532fd7ae7be59fdc19853b0d3077ae..eaa7364471de397fb7b53c1f124bbcc712392cf3 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
             text run at (14,42) width 12: "x"
           RenderBR {BR} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 3 {TEXT} of child 1 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 1 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {BR} of child 1 {SPAN} of root {DIV}
+caret: position 1 of child 2 {TEXT} of child 0 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt b/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt
index a57cb5bdf3c3c07ad8be65e155a34a843b759dcc..69dfcdc94b20f55bfe7add72cf021ab9fc5ec635 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt
@@ -15,7 +15,4 @@ layer at (0,0) size 800x600
           RenderBlock {BLOCKQUOTE} at (40,104) size 676x28
             RenderText {TEXT} at (0,0) size 42x28
               text run at (0,0) width 42: "Test"
-selection is CARET:
-start:      position 1 of child 3 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 4 {BR} of child 2 {DIV} of root {DIV}
+caret: position 1 of child 2 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3786362-fix-expected.txt b/LayoutTests/editing/inserting/insert-3786362-fix-expected.txt
index c51c7be6c29ba7b21e929dbbc300692d4747b657..41433f0de15ff0d4d4db9ff4f419308c8566f8a4 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3786362-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3786362-fix-expected.txt
@@ -16,7 +16,4 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,0) size 0x0
         RenderBR {BR} at (2,30) size 0x28
         RenderBR {BR} at (2,58) size 0x28
-selection is CARET:
-start:      position 1 of child 4 {BR} of child 3 {DIV} of root {BODY}
-upstream:   position 1 of child 4 {BR} of child 3 {DIV} of root {BODY}
-downstream: position 1 of child 4 {BR} of child 3 {DIV} of root {BODY}
+caret: position 1 of child 3 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt b/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt
index 17d4996db10637d2981885f08110f115ce20a42d..0216531078d289145e0cee9e46aab3e85e619f9d 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt
@@ -16,7 +16,4 @@ layer at (0,0) size 800x600
             RenderBR {BR} at (0,28) size 0x28
             RenderBR {BR} at (0,56) size 0x28
             RenderBR {BR} at (0,84) size 0x28
-selection is CARET:
-start:      position 0 of child 6 {BR} of child 2 {DIV} of root {DIV}
-upstream:   position 1 of child 5 {BR} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 6 {BR} of child 2 {DIV} of root {DIV}
+caret: position 0 of child 5 {BR} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3851164-fix-expected.txt b/LayoutTests/editing/inserting/insert-3851164-fix-expected.txt
index 44ffbe5a0c9e6aa0b7c69f86c89b5ab916f999c3..0cf5cf76604ae257fef2631c620c8edb73d294e6 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3851164-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3851164-fix-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,0) size 784x28
         RenderText {TEXT} at (0,0) size 12x28
           text run at (0,0) width 12: "x"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {P} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 1 {P} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 1 {P} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 0 {P} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt b/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt
index f8c3eca29ad4285e4390efdce147dfc849409f29..8861d6970c3bedaa757e8fd54d9afe3c9cb562f2 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt
@@ -23,7 +23,4 @@ layer at (0,0) size 800x600
           text run at (0,0) width 22: "baz"
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 3 of child 3 {TEXT} of root {BODY}
-upstream:   position 3 of child 3 {TEXT} of root {BODY}
-downstream: position 0 of child 8 {TEXT} of root {BODY}
+caret: position 3 of child 2 {TEXT} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-after-delete-001-expected.txt b/LayoutTests/editing/inserting/insert-after-delete-001-expected.txt
index 77f77f5afe89846c9c2f1108d027d6e98271a990..0b0d4e72ba66a622555e9256d46d5e9ea37b6e31 100644 (file)
--- a/LayoutTests/editing/inserting/insert-after-delete-001-expected.txt
+++ b/LayoutTests/editing/inserting/insert-after-delete-001-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 36x28
           text run at (14,14) width 36: "xxx"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of root {DIV}
-downstream: position 3 of child 1 {TEXT} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-001-expected.txt b/LayoutTests/editing/inserting/insert-br-001-expected.txt
index 20ddba13a1ebab3420303c9c7c9ed60beb1f5acc..8bbdfa12041a23d8ea24bf72e285563fa8cdef84 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-001-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-001-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
             text run at (14,42) width 12: "x"
           RenderBR {BR} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {BR} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-002-expected.txt b/LayoutTests/editing/inserting/insert-br-002-expected.txt
index db07bc6055b3c4cc7ec4bb45b088f71861b7d55a..6c708022df23a10f2ec81617acff8ceddbf5fb2e 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-002-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-002-expected.txt
@@ -14,7 +14,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 34x28
             text run at (14,70) width 34: "test"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {BR} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-003-expected.txt b/LayoutTests/editing/inserting/insert-br-003-expected.txt
index 9002bf3a5c8dfd72cffc20392978ab553c38af91..df99b3bdd5795b9ef05982be658d80cc31f88c71 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-003-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-003-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 46x28
             text run at (14,42) width 46: "xtest"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-004-expected.txt b/LayoutTests/editing/inserting/insert-br-004-expected.txt
index 7042ad9a958befa03d761b3f82b23252bb377523..f2b666fa2c5f4109f37f3a41d59256bc4f91a533 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-004-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-004-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (14,42) size 0x28
           RenderBR {BR} at (14,70) size 0x28
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 4 {BR} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {BR} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 3 {BR} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-005-expected.txt b/LayoutTests/editing/inserting/insert-br-005-expected.txt
index ac887a6ad63e2d19364472aec3d4294a4c996f8b..ff66aa382b53c3d8eb5bf6b53ac11c4ac853fafd 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-005-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-005-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
             text run at (14,70) width 12: "x"
           RenderBR {BR} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 4 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 4 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 5 {BR} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 3 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-006-expected.txt b/LayoutTests/editing/inserting/insert-br-006-expected.txt
index e02770af6b092703ee8edcb31dc22b49b931a670..7899e4aead648b9e61f124a5280aaa3ffc447497 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-006-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-006-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 44x28
             text run at (14,42) width 44: "xfoo"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 1 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-007-expected.txt b/LayoutTests/editing/inserting/insert-br-007-expected.txt
index 9794d1eb84e4b91f5d753927c3457a5dd1d51358..bb813045154943096e917d4ba3eedb70856f87d1 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-007-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-007-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 37x28
             text run at (14,42) width 37: " bar"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 2 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-br-008-expected.txt b/LayoutTests/editing/inserting/insert-br-008-expected.txt
index 04cfc28384b490a2e75897028595883558e05846..053692192af7d2487a72c5819921d12197bfb798 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-008-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-008-expected.txt
@@ -7,7 +7,4 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (14,14) size 0x28
         RenderText {TEXT} at (14,42) size 38x28
           text run at (14,42) width 38: " foo"
-selection is CARET:
-start:      position 1 of child 2 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 1 of child 2 {TEXT} of child 1 {DIV} of root {BODY}
-downstream: position 1 of child 2 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 1 of child 1 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-001-expected.txt b/LayoutTests/editing/inserting/insert-div-001-expected.txt
index 8856fb6129a542a937114a8fc46a3ec62362d8fb..ed1e0c8920029bf8702e5375a5bcb02efaa00c01 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-001-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-001-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 12x28
           text run at (14,14) width 12: "x"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-002-expected.txt b/LayoutTests/editing/inserting/insert-div-002-expected.txt
index 8856fb6129a542a937114a8fc46a3ec62362d8fb..ed1e0c8920029bf8702e5375a5bcb02efaa00c01 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-002-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-002-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 12x28
           text run at (14,14) width 12: "x"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-003-expected.txt b/LayoutTests/editing/inserting/insert-div-003-expected.txt
index f467cf7942f8227f6a71e2cea279ea9d44526c9e..f57128cfeb59c511f846a0e3ea24f37c468314d0 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-003-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-003-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 46x28
           text run at (14,14) width 46: "xtest"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-004-expected.txt b/LayoutTests/editing/inserting/insert-div-004-expected.txt
index 0ff796c5f51b6f4b5e4bd21f46a662ef65178575..8670b5d69250773b80252f5da8bd43cd868713fd 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-004-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-004-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (14,14) size 0x28
       RenderBlock {DIV} at (0,112) size 784x56 [border: (2px solid #FF0000)]
         RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 3 {DIV} of root {BODY}
-upstream:   position 0 of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 3 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-005-expected.txt b/LayoutTests/editing/inserting/insert-div-005-expected.txt
index ce9926e46560c0487e73d0e82ddcdab3b0776ff8..f536080e50355c3952421407ca04119e6c07af45 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-005-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-005-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,112) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 12x28
           text run at (14,14) width 12: "x"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-006-expected.txt b/LayoutTests/editing/inserting/insert-div-006-expected.txt
index a16b1304466b664572a6b9ca1240e7ab33f7d502..30390d1ff1f476b6dccf380b00b30eaee5cba202 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-006-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-006-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 46x28
           text run at (14,14) width 46: "xtest"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-007-expected.txt b/LayoutTests/editing/inserting/insert-div-007-expected.txt
index 247e925c147e2c0799b3f2541d1c710b5b352fa6..d2509a89aaead041ca27566879aa5f2b8148f1d9 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-007-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-007-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 37x28
           text run at (14,14) width 37: " bar"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 0 of child 2 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-008-expected.txt b/LayoutTests/editing/inserting/insert-div-008-expected.txt
index 09ccb037f58e615e027701b1794d057a6b29e640..a3389958848e1e435f9bf1e0d8dbf9c1b12d0ec4 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-008-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-008-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 44x28
           text run at (14,14) width 44: "xfoo"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-009-expected.txt b/LayoutTests/editing/inserting/insert-div-009-expected.txt
index 56aefdd03a37b89adf80ac70a6a1838493c40ca5..40d9f1b2267514a64283531fa4d9719b6fcca127 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-009-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-009-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,18) size 784x18
         RenderText {TEXT} at (0,0) size 8x18
           text run at (0,0) width 8: "x"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-010-expected.txt b/LayoutTests/editing/inserting/insert-div-010-expected.txt
index 2686270ad3860c3df10e2522c387778343f561b0..2fd2b5360f75fc9562f3d245fc4a77e3d526687d 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-010-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-010-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (14,42) size 756x28
         RenderText {TEXT} at (0,0) size 12x28
           text run at (0,0) width 12: "x"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 0 of child 2 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-011-expected.txt b/LayoutTests/editing/inserting/insert-div-011-expected.txt
index dcebfcf1d2e722f7cf3b9c158c788ad6469d79d3..0b9b948a173c53bcd1cdd234d16677dc90e226bc 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-011-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-011-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
           text run at (14,14) width 32: "foo"
       RenderBlock {DIV} at (0,236) size 784x56 [border: (2px solid #FF0000)]
         RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 5 {DIV} of root {BODY}
-upstream:   position 0 of child 5 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 5 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-012-expected.txt b/LayoutTests/editing/inserting/insert-div-012-expected.txt
index 7c5b1b10a149dd11e98bbd3e91ff981b47144f53..a8e5002e504208e6e0c49fd009e1b416676a86f6 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-012-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-012-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
           text run at (14,14) width 32: "foo"
       RenderBlock {DIV} at (0,236) size 784x56 [border: (2px solid #FF0000)]
         RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 5 {DIV} of root {BODY}
-upstream:   position 0 of child 5 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 5 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-013-expected.txt b/LayoutTests/editing/inserting/insert-div-013-expected.txt
index af6e10d04ad2c6ed0c1c4c7afcc199021847a8fb..59b74bd4145eb404cd17344234b0093a31cb51ef 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-013-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-013-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
           text run at (14,14) width 32: "foo"
       RenderBlock {DIV} at (0,260) size 784x56 [border: (2px solid #FF0000)]
         RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 6 {TEXT} of root {BODY}
-upstream:   position 0 of child 6 {TEXT} of root {BODY}
-downstream: position 0 of child 6 {TEXT} of root {BODY}
+caret: position 0 of child 5 {TEXT} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-014-expected.txt b/LayoutTests/editing/inserting/insert-div-014-expected.txt
index 460a4d64b2fc6760c9f57f8919aa71aae62dd4bb..ef044f80d554d7068ab8b2136cab0ea4114f730a 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-014-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-014-expected.txt
@@ -21,7 +21,4 @@ layer at (0,0) size 800x600
             text run at (14,14) width 32: "foo"
         RenderBlock {DIV} at (14,98) size 756x56 [border: (2px solid #FF0000)]
           RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 6 {DIV} of root {BODY}
-upstream:   position 0 of child 6 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 6 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-015-expected.txt b/LayoutTests/editing/inserting/insert-div-015-expected.txt
index 719c9a3cdb7431e9609a1e344d791f1b4621c6a6..ee770f538ce13c0b8e704acc953764ae097f37cf 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-015-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-015-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
           text run at (14,14) width 32: "foo"
       RenderBlock {DIV} at (0,236) size 784x56 [border: (2px solid #FF0000)]
         RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 7 {DIV} of root {BODY}
-upstream:   position 0 of child 7 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 7 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 6 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-016-expected.txt b/LayoutTests/editing/inserting/insert-div-016-expected.txt
index 37518ae88d115d6c8dc46af5dd8a1dca36501d7f..299d132a9743a6ccd3c72e8ac97c816b28c47ed8 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-016-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-016-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (14,14) size 0x28
       RenderBlock {DIV} at (0,236) size 784x56 [border: (2px solid #FF0000)]
         RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 7 {DIV} of root {BODY}
-upstream:   position 0 of child 7 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 7 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 6 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-017-expected.txt b/LayoutTests/editing/inserting/insert-div-017-expected.txt
index 90a260d95e4443b7843917e4c5055365e6e4d431..4d4c7891d767097b48a2ecf0978ef64f022036bf 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-017-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-017-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (14,14) size 0x28
       RenderBlock {DIV} at (0,236) size 784x56 [border: (2px solid #FF0000)]
         RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 9 {DIV} of root {BODY}
-upstream:   position 0 of child 9 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 9 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 8 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-018-expected.txt b/LayoutTests/editing/inserting/insert-div-018-expected.txt
index b64b2d6929df37f253746540f1787a9b35bdf127..52ab72622a7d864d5b9c18eca58b8fbeba95901f 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-018-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-018-expected.txt
@@ -16,7 +16,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
           RenderText {TEXT} at (14,14) size 34x28
             text run at (14,14) width 34: "baz"
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 4 {DIV} of root {BODY}
-upstream:   position 0 of child 4 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 4 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-019-expected.txt b/LayoutTests/editing/inserting/insert-div-019-expected.txt
index dbb587f65790bf87c2b3e67c984fc9e89f0f2325..ad67b4c6ef2f87465e9eb28c1dc4d32d8303d1c5 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-019-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-019-expected.txt
@@ -18,7 +18,4 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,304) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 31x28
           text run at (14,14) width 31: "bar"
-selection is CARET:
-start:      position 0 of child 6 {BR} of root {BODY}
-upstream:   position 0 of child 6 {BR} of root {BODY}
-downstream: position 0 of child 6 {BR} of root {BODY}
+caret: position 0 of child 5 {BR} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-020-expected.txt b/LayoutTests/editing/inserting/insert-div-020-expected.txt
index 5746fc853fca89b20de1d28912fafa9a8e5eddc9..d15850f9b148a0bfab429b587b74867a0edbf652 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-020-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-020-expected.txt
@@ -18,7 +18,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,176) size 784x56 [border: (2px solid #0000FF)]
         RenderText {TEXT} at (14,14) size 31x28
           text run at (14,14) width 31: "bar"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 8 {DIV} of root {BODY}
-upstream:   position 0 of child 8 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 8 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-021-expected.txt b/LayoutTests/editing/inserting/insert-div-021-expected.txt
index 47799d5c6875b9011acf0698b5abee8b0f5fc4b2..fc1fb94d6179874ede6272fc970d1c9efad9067e 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-021-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-021-expected.txt
@@ -24,7 +24,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,232) size 784x56 [border: (2px solid #0000FF)]
         RenderText {TEXT} at (14,14) size 31x28
           text run at (14,14) width 31: "bar"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 8 {DIV} of root {BODY}
-upstream:   position 0 of child 8 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 8 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-022-expected.txt b/LayoutTests/editing/inserting/insert-div-022-expected.txt
index 88a632c0ba0854b901f2f725f7dc5c2770813f64..8541acfde3944791815f815f049dfe4ab64cb4bd 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-022-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-022-expected.txt
@@ -26,7 +26,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
         RenderText {TEXT} at (14,42) size 31x28
           text run at (14,42) width 31: "bar"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {B} of child 7 {P} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 1 {B} of child 7 {P} of root {BODY}
-downstream: position 0 of child 2 {BR} of child 1 {B} of child 7 {P} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 0 {B} of child 6 {P} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-023-expected.txt b/LayoutTests/editing/inserting/insert-div-023-expected.txt
index 84bfc6d7d6a7c60fce743c8d5b243fc5395b6aee..dbc053347543cfcff2e9c4c8b295439b6456baad 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-023-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-023-expected.txt
@@ -35,7 +35,4 @@ layer at (0,0) size 800x688
       RenderBlock {P} at (0,600) size 784x56 [border: (2px solid #0000FF)]
         RenderText {TEXT} at (14,14) size 55x28
           text run at (14,14) width 55: "line 3"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {B} of child 12 {P} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 1 {B} of child 12 {P} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 1 {B} of child 12 {P} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 0 {B} of child 11 {P} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-024-expected.txt b/LayoutTests/editing/inserting/insert-div-024-expected.txt
index 60cf41dcd241e5264247d8ef3006223eff8c6344..cb5cb089cf2dbfd0b31ff27b713770f6c4b3422b 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-024-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-024-expected.txt
@@ -26,7 +26,4 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,388) size 784x56 [border: (2px solid #0000FF)]
         RenderText {TEXT} at (14,14) size 36x28
           text run at (14,14) width 36: "xxx"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 9 {P} of root {BODY}
-upstream:   position 3 of child 1 {TEXT} of child 9 {P} of root {BODY}
-downstream: position 3 of child 1 {TEXT} of child 9 {P} of root {BODY}
+caret: position 3 of child 0 {TEXT} of child 8 {P} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-025-expected.txt b/LayoutTests/editing/inserting/insert-div-025-expected.txt
index 8bca8348b265500ae26b8abac31b4742e22f8847..d933c04876599daf56d962ed524cea65190531e6 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-025-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-025-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
           RenderText {TEXT} at (14,14) size 31x28
             text run at (14,14) width 31: "bar"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-026-expected.txt b/LayoutTests/editing/inserting/insert-div-026-expected.txt
index 805d0f78e4c57e8a162ea7c64fc1942cbac41672..b6c5d75957617dc4b4ac6dd0d93c3f98ae0646a1 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-026-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-026-expected.txt
@@ -35,7 +35,4 @@ layer at (0,0) size 800x600
               text run at (2,2) width 20: "fo"
           RenderText {TEXT} at (22,2) size 12x28
             text run at (22,2) width 12: "x"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 0 {B} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-div-027-expected.txt b/LayoutTests/editing/inserting/insert-div-027-expected.txt
index c37b6ac4cf33fd5a30d9e13beb517d66df62db35..10785e4fb53b472e2cbe99bc797107375cde81cb 100644 (file)
--- a/LayoutTests/editing/inserting/insert-div-027-expected.txt
+++ b/LayoutTests/editing/inserting/insert-div-027-expected.txt
@@ -23,7 +23,4 @@ layer at (0,0) size 800x600
             text run at (14,14) width 32: "foo"
         RenderBlock {DIV} at (14,98) size 756x56 [border: (2px solid #FF0000)]
           RenderBR {BR} at (14,14) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 5 {DIV} of root {BODY}
-upstream:   position 0 of child 5 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 5 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-space-in-empty-doc-expected.txt b/LayoutTests/editing/inserting/insert-space-in-empty-doc-expected.txt
index cdbb989f5caa4550a5e157a3b2dcc073976c4d96..046c9166721bf00a9234b98e958cd78ef90639b6 100644 (file)
--- a/LayoutTests/editing/inserting/insert-space-in-empty-doc-expected.txt
+++ b/LayoutTests/editing/inserting/insert-space-in-empty-doc-expected.txt
@@ -6,7 +6,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 38x28
           text run at (14,14) width 38: " foo"
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 4 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-downstream: position 4 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 4 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-tab-001-expected.txt b/LayoutTests/editing/inserting/insert-tab-001-expected.txt
index e6160cbb73a7e0d328ed2e3fe195d83cc8b3fe14..689938cea00fb00c47162ef4762e083559ae63fb 100644 (file)
--- a/LayoutTests/editing/inserting/insert-tab-001-expected.txt
+++ b/LayoutTests/editing/inserting/insert-tab-001-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 56x28
             text run at (14,14) width 56: "    foo"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-tab-002-expected.txt b/LayoutTests/editing/inserting/insert-tab-002-expected.txt
index 7851bb6f794c09ead9129477e2067877e4b69848..8feef38bafd6b8f3aa972c29bd9b2dfe03369ca0 100644 (file)
--- a/LayoutTests/editing/inserting/insert-tab-002-expected.txt
+++ b/LayoutTests/editing/inserting/insert-tab-002-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 56x28
             text run at (14,14) width 56: "foo    "
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 7 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of root {DIV}
+caret: position 7 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-tab-003-expected.txt b/LayoutTests/editing/inserting/insert-tab-003-expected.txt
index 6308092c57b849a81b30f3e08e3a9f7e693d61b8..594a8503448c64c6cf1a4b8109931b5f89237a73 100644 (file)
--- a/LayoutTests/editing/inserting/insert-tab-003-expected.txt
+++ b/LayoutTests/editing/inserting/insert-tab-003-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 56x28
             text run at (14,14) width 56: "fo    o"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 6 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 6 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 6 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 6 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-tab-004-expected.txt b/LayoutTests/editing/inserting/insert-tab-004-expected.txt
index 9080dafc118659ee1a8d0c87402b5fe60988d627..5036493e6dc0a71ac9cbe9dba348ebd101364c21 100644 (file)
--- a/LayoutTests/editing/inserting/insert-tab-004-expected.txt
+++ b/LayoutTests/editing/inserting/insert-tab-004-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 56x28
             text run at (14,42) width 56: "    foo"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 4 of child 2 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 1 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt b/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt
index 643e56bdf50617c825f272f24bb3555e407809ad..c0dab760af3c86e534f0bebb9d5c2df5e8381f81 100644 (file)
--- a/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt
+++ b/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt
@@ -18,7 +18,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,98) size 70x28
             text run at (14,98) width 70: "bazxxx"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 6 of child 7 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 6 of child 7 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of root {DIV}
+caret: position 6 of child 6 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/return-key-with-selection-001-expected.txt b/LayoutTests/editing/inserting/return-key-with-selection-001-expected.txt
index 603d0bc6df18887c0e63c963e168068951adc4d4..f701cf616baa6ae7e2454655867710768426349e 100644 (file)
--- a/LayoutTests/editing/inserting/return-key-with-selection-001-expected.txt
+++ b/LayoutTests/editing/inserting/return-key-with-selection-001-expected.txt
@@ -42,7 +42,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,58) size 780x28
             RenderText {TEXT} at (0,0) size 34x28
               text run at (0,0) width 34: "baz"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 4 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 4 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 3 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/return-key-with-selection-002-expected.txt b/LayoutTests/editing/inserting/return-key-with-selection-002-expected.txt
index 93b1fc1834e1571cc0a133024a932de081c7e965..277b39bcc2e99e46ecf6ba9d2e100f30051a100a 100644 (file)
--- a/LayoutTests/editing/inserting/return-key-with-selection-002-expected.txt
+++ b/LayoutTests/editing/inserting/return-key-with-selection-002-expected.txt
@@ -42,7 +42,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,58) size 780x28
             RenderText {TEXT} at (0,0) size 34x28
               text run at (0,0) width 34: "baz"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 4 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 4 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 3 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/return-key-with-selection-003-expected.txt b/LayoutTests/editing/inserting/return-key-with-selection-003-expected.txt
index 36a06438a4c17b45af3f9ff45559dc8974609cda..c301d88fc3afbecbde65a9b2986560ad92f33c98 100644 (file)
--- a/LayoutTests/editing/inserting/return-key-with-selection-003-expected.txt
+++ b/LayoutTests/editing/inserting/return-key-with-selection-003-expected.txt
@@ -47,7 +47,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,86) size 780x28
             RenderText {TEXT} at (0,0) size 34x28
               text run at (0,0) width 34: "baz"
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 4 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 4 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 3 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/typing-001-expected.txt b/LayoutTests/editing/inserting/typing-001-expected.txt
index bf713c0c7f73d07d6baa421b077ffbed8c98bbbb..1bf5f581302955a92fdc5e8ba7024481653c7788 100644 (file)
--- a/LayoutTests/editing/inserting/typing-001-expected.txt
+++ b/LayoutTests/editing/inserting/typing-001-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 176x28
             text run at (14,14) width 176: "xxxXXxxxXXxxx"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 13 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 13 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of root {DIV}
+caret: position 13 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/typing-002-expected.txt b/LayoutTests/editing/inserting/typing-002-expected.txt
index 9bfb7b323a98bb31875c8ae2314ec27c0dffd1fa..97d5d94ac7e32cca8e9324774c0f37799218f600 100644 (file)
--- a/LayoutTests/editing/inserting/typing-002-expected.txt
+++ b/LayoutTests/editing/inserting/typing-002-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
             RenderText {TEXT} at (93,14) size 33x28
               text run at (93,14) width 33: "bar"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 7 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {I} of child 2 {SPAN} of root {DIV}
+caret: position 7 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/typing-003-expected.txt b/LayoutTests/editing/inserting/typing-003-expected.txt
index b23d7de5d9a1449e254b37fb208d37f6e6e47065..b18abfce4d83c55a3babfe5da46b612e8f3045ac 100644 (file)
--- a/LayoutTests/editing/inserting/typing-003-expected.txt
+++ b/LayoutTests/editing/inserting/typing-003-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
           text run at (14,98) width 360: "xxxxx xxxxxxxxxxxx xxxxxxxx xxx "
         RenderInline {SPAN} at (0,0) size 0x28
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 233 of child 1 {TEXT} of root {DIV}
-upstream:   position 233 of child 1 {TEXT} of root {DIV}
-downstream: position 1 of child 4 {TEXT} of root {DIV}
+caret: position 233 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/typing-around-br-001-expected.txt b/LayoutTests/editing/inserting/typing-around-br-001-expected.txt
index 08301047f87603b44da1480e20a1dd332d332d15..ff93897705383af5d653e7049f529425bc107a50 100644 (file)
--- a/LayoutTests/editing/inserting/typing-around-br-001-expected.txt
+++ b/LayoutTests/editing/inserting/typing-around-br-001-expected.txt
@@ -29,7 +29,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,210) size 70x28
             text run at (14,210) width 70: "XXxxx"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 5 of child 15 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 5 of child 15 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of root {DIV}
+caret: position 5 of child 14 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/inserting/typing-around-image-001-expected.txt b/LayoutTests/editing/inserting/typing-around-image-001-expected.txt
index 19a7b457d122577a04b278f910bb04259bff66fd..b8edae274781b3212bf83f5945c00f1a85532239 100644 (file)
--- a/LayoutTests/editing/inserting/typing-around-image-001-expected.txt
+++ b/LayoutTests/editing/inserting/typing-around-image-001-expected.txt
@@ -18,7 +18,4 @@ layer at (0,0) size 800x600
           RenderImage {IMG} at (292,14) size 76x103
           RenderText {TEXT} at (368,95) size 36x28
             text run at (368,95) width 36: "xxx"
-selection is CARET:
-start:      position 3 of child 8 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 8 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 3 of child 8 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 3 of child 7 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/cut-text-001-expected.txt b/LayoutTests/editing/pasteboard/cut-text-001-expected.txt
index 305c95b91461d9dacf344b84dc4586c1a76576d3..a871953bbecfd630515ea98939e1921d701bacf1 100644 (file)
--- a/LayoutTests/editing/pasteboard/cut-text-001-expected.txt
+++ b/LayoutTests/editing/pasteboard/cut-text-001-expected.txt
@@ -8,7 +8,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 78x28
             text run at (14,14) width 78: "foo  baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 4 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-4035648-fix-expected.txt b/LayoutTests/editing/pasteboard/paste-4035648-fix-expected.txt
index 4d08446e302884c71925eaa7c332adf4798c3e49..4f2b6ffb51631d80cc9e773e653e3c4976d3f0d5 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-4035648-fix-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-4035648-fix-expected.txt
@@ -38,7 +38,4 @@ layer at (0,0) size 800x600
             RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (2,58) size 49x28
             text run at (2,58) width 49: "plain"
-selection is CARET:
-start:      position 5 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 5 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 5 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 5 of child 2 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-4038267-fix-expected.txt b/LayoutTests/editing/pasteboard/paste-4038267-fix-expected.txt
index ad1025787a9a67eee61376704be5ad20f7f06b48..30ee3ab23a6331ab8c7a10791f6d1865bb4c7d6e 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-4038267-fix-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-4038267-fix-expected.txt
@@ -38,7 +38,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,30) size 780x28
             RenderText {TEXT} at (0,0) size 31x28
               text run at (0,0) width 31: "bar"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-001-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-001-expected.txt
index 63f7342fc3c79bfff6c90d47649ea21051e60680..80c1f73cd0a9895334bf3b300f88026f1388e95b 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-001-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-001-expected.txt
@@ -30,7 +30,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (2,30) size 79x28
             text run at (2,30) width 79: "line two"
-selection is CARET:
-start:      position 0 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 2 {BR} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 2 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-002-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-002-expected.txt
index 1e1bb3754bc7bbd3f561c177c21a1e7ad7ea135e..06eddc88d9a3ac8eb4e9ef0eb4008f8505d1a1a2 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-002-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-002-expected.txt
@@ -31,7 +31,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,30) size 780x28
             RenderText {TEXT} at (0,0) size 79x28
               text run at (0,0) width 79: "line two"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-003-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-003-expected.txt
index 64e65c64659ffa8fbdf394a476007f6781d582f2..b2c19f7fe7f637fde24f89e199bfee02652c709b 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-003-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-003-expected.txt
@@ -31,7 +31,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,30) size 780x28
             RenderText {TEXT} at (0,0) size 79x28
               text run at (0,0) width 79: "line two"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-004-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-004-expected.txt
index 4c13bff880d0c9078330b13c366b74ee4e8e8296..68e4aedf987cf18a3cb68efc015299dc642e9234 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-004-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-004-expected.txt
@@ -32,7 +32,4 @@ layer at (0,0) size 800x600
             RenderBlock {DIV} at (0,28) size 780x28
               RenderText {TEXT} at (0,0) size 79x28
                 text run at (0,0) width 79: "line two"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of child 2 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 1 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-005-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-005-expected.txt
index 78eb35fd9f84ac501e5a534c9744638624a6a939..777c6e7015c4b447d1b99c985d0f61093901db17 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-005-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-005-expected.txt
@@ -32,7 +32,4 @@ layer at (0,0) size 800x600
             RenderBlock (anonymous) at (0,28) size 780x28
               RenderText {TEXT} at (0,0) size 79x28
                 text run at (0,0) width 79: "line two"
-selection is CARET:
-start:      position 0 of child 2 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 1 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-006-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-006-expected.txt
index 5b6d2148736627f04991655d6ffeb5dcb63de45f..e5f850b1b188ba2482ee0ae23a4cf9c1e2b10b66 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-006-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-006-expected.txt
@@ -33,7 +33,4 @@ layer at (0,0) size 800x600
             text run at (2,30) width 7: "l"
           RenderText {TEXT} at (9,30) size 72x28
             text run at (9,30) width 72: "ine two"
-selection is CARET:
-start:      position 1 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 2 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-007-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-007-expected.txt
index 7c79bb31f6773be246e14bb773d421b55b904ef6..d5443264726572b315cb979db3c631b704e1edcf 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-007-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-007-expected.txt
@@ -34,7 +34,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 7: "l"
             RenderText {TEXT} at (7,0) size 72x28
               text run at (7,0) width 72: "ine two"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-008-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-008-expected.txt
index 5fdbe04af6cc533e37f985570d9874051fa3b905..60c69bd9af71b7d2c4e906ee56be7ccfeb8b6e6d 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-008-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-008-expected.txt
@@ -34,7 +34,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 7: "l"
             RenderText {TEXT} at (7,0) size 72x28
               text run at (7,0) width 72: "ine two"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 2 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-009-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-009-expected.txt
index caa382780cf0254e8fd0447b10fedce6f36d21d8..fb2feeef53e6712e86f2ba6e03f4d51a9c5139d2 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-009-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-009-expected.txt
@@ -35,7 +35,4 @@ layer at (0,0) size 800x600
                 text run at (0,0) width 7: "l"
               RenderText {TEXT} at (7,0) size 72x28
                 text run at (7,0) width 72: "ine two"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {DIV} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 2 {DIV} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of child 2 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 1 {DIV} of child 1 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-line-endings-010-expected.txt b/LayoutTests/editing/pasteboard/paste-line-endings-010-expected.txt
index 1c72917270f472f9cc522d13540609031da99817..41cafbdd67e476fd17ba4e2930cec3a36adbdd8c 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-line-endings-010-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-line-endings-010-expected.txt
@@ -35,7 +35,4 @@ layer at (0,0) size 800x600
                 text run at (0,0) width 7: "l"
               RenderText {TEXT} at (7,0) size 72x28
                 text run at (7,0) width 72: "ine two"
-selection is CARET:
-start:      position 1 of child 2 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 2 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 2 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 1 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt b/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt
index 14c0310f03d710710b475ff90f4019841046594a..03673fbc05690961aa185bd47653f97f2df3bb24 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt
@@ -29,7 +29,4 @@ layer at (0,0) size 800x600
               text run at (2,2) width 12: "a"
             RenderText {TEXT} at (14,2) size 13x28
               text run at (14,2) width 13: "b"
-selection is CARET:
-start:      position 1 of child 2 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
-upstream:   position 1 of child 2 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
-downstream: position 1 of child 2 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 1 {TEXT} of child 0 {B} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-match-style-002-expected.txt b/LayoutTests/editing/pasteboard/paste-match-style-002-expected.txt
index 8d8ac8d3fecba5569f74b398b583f80e94b72929..5765ed0bba0eb6f2e7e3faf569261e8f2f758197 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-match-style-002-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-match-style-002-expected.txt
@@ -33,7 +33,4 @@ layer at (0,0) size 800x600
           RenderInline {B} at (0,0) size 50x28
             RenderText {TEXT} at (2,2) size 50x28
               text run at (2,2) width 50: "hello"
-selection is CARET:
-start:      position 5 of child 1 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
-upstream:   position 5 of child 1 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
-downstream: position 5 of child 1 {TEXT} of child 1 {B} of child 1 {DIV} of root {DIV}
+caret: position 5 of child 0 {TEXT} of child 0 {B} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-pre-001-expected.txt b/LayoutTests/editing/pasteboard/paste-pre-001-expected.txt
index 5a14175cd6adc12d96028b022dd3c91c0aef29ed..b82be9a3c51a240368465c6787f5aad8988f22ab 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-pre-001-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-pre-001-expected.txt
@@ -34,7 +34,4 @@ layer at (0,0) size 800x600
             RenderText {TEXT} at (0,0) size 42x56
               text run at (0,0) width 42: "foo"
               text run at (0,28) width 42: "bar"
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 2 {PRE} of child 1 {DIV} of root {DIV}
-upstream:   position 7 of child 1 {TEXT} of child 2 {PRE} of child 1 {DIV} of root {DIV}
-downstream: position 7 of child 1 {TEXT} of child 2 {PRE} of child 1 {DIV} of root {DIV}
+caret: position 7 of child 0 {TEXT} of child 1 {PRE} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-001-expected.txt b/LayoutTests/editing/pasteboard/paste-text-001-expected.txt
index e5f81ad1b9ed24d198c6592ef0a2c150342beaed..5212214350cf09014279200d85aba7123d2b161e 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-001-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-001-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (114,14) size 40x28
             text run at (114,14) width 40: " baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {SPAN} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-002-expected.txt b/LayoutTests/editing/pasteboard/paste-text-002-expected.txt
index 861fbaa05ac0e78453dab3f06beccb5b0649c452..a1f354d60c2bd43af706cc36e0da229d9d56e19e 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-002-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-002-expected.txt
@@ -24,7 +24,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,224) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 357x28
           text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection is CARET:
-start:      position 11 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 11 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 2 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 11 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-003-expected.txt b/LayoutTests/editing/pasteboard/paste-text-003-expected.txt
index e302d1cd01edee2eca6cdf6fde707b0c10fb66cd..877011ffe807f6c8597af9ab8ab4fa20fb83b6ea 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-003-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-003-expected.txt
@@ -34,7 +34,4 @@ layer at (0,0) size 800x600
             RenderBlock {DIV} at (14,14) size 700x56 [border: (2px solid #FF0000)]
               RenderText {TEXT} at (14,14) size 357x28
                 text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection is CARET:
-start:      position 7 of child 1 {TEXT} of child 2 {DIV} of child 3 {DIV} of child 3 {DIV} of child 1 {DIV} of root {BODY}
-upstream:   position 7 of child 1 {TEXT} of child 2 {DIV} of child 3 {DIV} of child 3 {DIV} of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 2 {TEXT} of child 2 {DIV} of child 3 {DIV} of child 3 {DIV} of child 1 {DIV} of root {BODY}
+caret: position 7 of child 0 {TEXT} of child 1 {DIV} of child 2 {DIV} of child 2 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-004-expected.txt b/LayoutTests/editing/pasteboard/paste-text-004-expected.txt
index 4861d49763b0edbe9e2e88b649d4f82e463ec36f..61b3de319f5d5eddc06d87a67cf2dd4e2c4a0c78 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-004-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-004-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,168) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 357x28
           text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 0 of child 2 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-005-expected.txt b/LayoutTests/editing/pasteboard/paste-text-005-expected.txt
index cdb1c5b289e1bdbfccf5344cb63cd677220fe3d1..6fd43c618b1451e97b3d43b364eaaff72e8134e3 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-005-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-005-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,224) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 357x28
           text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 0 of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-006-expected.txt b/LayoutTests/editing/pasteboard/paste-text-006-expected.txt
index dd2511a1c85e71090265f9e406dde2e0d97f6f21..3c99a38404e5d8e601da4bd733f1e9445d398fc6 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-006-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-006-expected.txt
@@ -18,7 +18,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,224) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 357x28
           text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 0 of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-007-expected.txt b/LayoutTests/editing/pasteboard/paste-text-007-expected.txt
index 9f275afcce168bcd43bac4438f7fb0129f9dc8ba..8e25ea629c523f0cfda25fb4082cfd6b2fc25699 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-007-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-007-expected.txt
@@ -21,7 +21,4 @@ layer at (0,0) size 800x600
             RenderBlock {DIV} at (14,42) size 700x56 [border: (2px solid #FF0000)]
               RenderText {TEXT} at (14,14) size 357x28
                 text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of child 2 {DIV} of root {BODY}
-upstream:   position 0 of child 3 {DIV} of child 2 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of child 2 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-008-expected.txt b/LayoutTests/editing/pasteboard/paste-text-008-expected.txt
index e423a5ad753763fc02ee9a8511ff22aef968c0e0..bcc08392c2e53e4a5a0026b4d39debac6bb848b0 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-008-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-008-expected.txt
@@ -22,7 +22,4 @@ layer at (0,0) size 800x600
           text run at (14,14) width 197: "Upon such a full sea"
         RenderText {TEXT} at (211,14) size 185x28
           text run at (211,14) width 185: " are we now afloat,"
-selection is CARET:
-start:      position 20 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 20 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 2 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 20 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-009-expected.txt b/LayoutTests/editing/pasteboard/paste-text-009-expected.txt
index 5fd9eb79e41fa5440c220598ea0f2008b2e119d2..ed1a48ce1fc3160dbf595a17fc843aa9527313fa 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-009-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-009-expected.txt
@@ -18,7 +18,4 @@ layer at (0,0) size 800x600
           text run at (14,14) width 17: "U"
         RenderText {TEXT} at (31,14) size 365x28
           text run at (31,14) width 365: "pon such a full sea are we now afloat,"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 1 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-downstream: position 0 of child 2 {TEXT} of child 3 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-010-expected.txt b/LayoutTests/editing/pasteboard/paste-text-010-expected.txt
index 710a95e327b5c4c75e20862132cd4b44caa05275..7bc92dd7041cebe013770696be3eaebc46830b58 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-010-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-010-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (88,70) size 74x28
           text run at (88,70) width 74: "of men."
         RenderBR {BR} at (0,0) size 0x0
-selection is CARET:
-start:      position 7 of child 5 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 7 of child 5 {TEXT} of child 2 {DIV} of root {BODY}
-downstream: position 0 of child 6 {BR} of child 2 {DIV} of root {BODY}
+caret: position 7 of child 4 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-011-expected.txt b/LayoutTests/editing/pasteboard/paste-text-011-expected.txt
index 5ddbcc4950dc8833a28d738b7815389221873833..5a15a3f06e4b21305bb95f26c13b4c0852740121 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-011-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-011-expected.txt
@@ -23,7 +23,4 @@ layer at (0,0) size 800x600
           RenderInline {B} at (0,0) size 39x18
             RenderText {TEXT} at (0,0) size 39x18
               text run at (0,0) width 39: "there"
-selection is CARET:
-start:      position 5 of child 1 {TEXT} of child 1 {B} of child 1 {FONT} of child 5 {P} of root {BODY}
-upstream:   position 5 of child 1 {TEXT} of child 1 {B} of child 1 {FONT} of child 5 {P} of root {BODY}
-downstream: position 5 of child 1 {TEXT} of child 1 {B} of child 1 {FONT} of child 5 {P} of root {BODY}
+caret: position 5 of child 0 {TEXT} of child 0 {B} of child 0 {FONT} of child 4 {P} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-012-expected.txt b/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
index 534847c81b9484c6de8bced7faadbac6bf988d26..a05a45cefa3aadd52016c4608445d1302da5feb3 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
@@ -24,7 +24,4 @@ layer at (0,0) size 800x600
             RenderText {TEXT} at (0,0) size 32x28
               text run at (0,0) width 32: "foo"
       RenderBlock {DIV} at (0,268) size 784x28 [border: (2px solid #FF0000)]
-selection is CARET:
-start:      position 0 of child 9 {DIV} of root {BODY}
-upstream:   position 0 of child 9 {DIV} of root {BODY}
-downstream: position 1 of child 9 {DIV} of root {BODY}
+caret: position 0 of child 8 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-013-expected.txt b/LayoutTests/editing/pasteboard/paste-text-013-expected.txt
index c65740ea1bc02679f28f98185c6a8f888926946c..8dda27e43d52571242d9875056308f16f8db4b66 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-013-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-013-expected.txt
@@ -28,7 +28,4 @@ layer at (0,0) size 800x600
             text run at (0,0) width 32: "foo"
         RenderBlock {BLOCKQUOTE} at (54,118) size 676x28
           RenderBR {BR} at (0,0) size 0x28
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 3 {BLOCKQUOTE} of child 8 {DIV} of root {BODY}
-upstream:   position 0 of child 3 {BLOCKQUOTE} of child 8 {DIV} of root {BODY}
-downstream: position 0 of child 1 {BR} of child 3 {BLOCKQUOTE} of child 8 {DIV} of root {BODY}
+caret: position 0 of child 0 {BR} of child 2 {BLOCKQUOTE} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-014-expected.txt b/LayoutTests/editing/pasteboard/paste-text-014-expected.txt
index a4231f4b7a087901ce64667bfb08147e915fc3e6..7031faac347c6ccf2b307470cc9b4d794ad36285 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-014-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-014-expected.txt
@@ -26,7 +26,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,268) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 12x28
           text run at (14,14) width 12: "x"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 9 {DIV} of root {BODY}
-upstream:   position 0 of child 9 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 9 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 8 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-015-expected.txt b/LayoutTests/editing/pasteboard/paste-text-015-expected.txt
index a6423a0cc62fd3270a21fff9035c303c4ac7abe5..c44916b1463342d1a1ecaeeb4f4f45fc4808a93f 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-015-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-015-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
           RenderBlock {P} at (14,98) size 756x28
             RenderText {TEXT} at (0,0) size 31x28
               text run at (0,0) width 31: "bar"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 4 {P} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 4 {P} of child 2 {DIV} of root {DIV}
-downstream: position 3 of child 1 {TEXT} of child 4 {P} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 3 {P} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-016-expected.txt b/LayoutTests/editing/pasteboard/paste-text-016-expected.txt
index 47d213e2417f48b13a397bea2cb54a4cd4e693f5..254d7e7f50f85ca18433cbecfc950cb318e70755 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-016-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-016-expected.txt
@@ -39,7 +39,4 @@ layer at (0,0) size 800x600
               text run at (0,0) width 6: " "
           RenderBlock {P} at (14,182) size 756x28
             RenderBR {BR} at (0,0) size 0x28
-selection is CARET:
-start:      position 0 of child 4 {BR} of child 1 {P} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {BR} of child 1 {P} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 4 {BR} of child 1 {P} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 3 {BR} of child 0 {P} of child 0 {DIV} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-017-expected.txt b/LayoutTests/editing/pasteboard/paste-text-017-expected.txt
index ff51801b2855884b906ba8518acd99189be86156..467b5d5763a80f331c0f24ac49bda452251fa78a 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-017-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-017-expected.txt
@@ -37,7 +37,4 @@ layer at (0,0) size 800x600
           RenderBlock {DIV} at (2,114) size 780x28
             RenderText {TEXT} at (0,0) size 49x28
               text run at (0,0) width 49: "three"
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 7 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 7 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 7 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 6 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/paste-text-018-expected.txt b/LayoutTests/editing/pasteboard/paste-text-018-expected.txt
index 5f5f9956d733d28ab256c92a0e96cb930b567744..a67c6fbe3db298526dd192d160d7addc0bd74fac 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-018-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-text-018-expected.txt
@@ -32,7 +32,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (2,30) size 79x28
             text run at (2,30) width 79: "line two"
-selection is CARET:
-start:      position 8 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 8 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {BR} of child 1 {DIV} of root {DIV}
+caret: position 8 of child 0 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt b/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt
index 2833857da9b249382310ae6a2aa92e44b94df0d2..c29223da6a6fc16c652328e992027458a5d7eb65 100644 (file)
--- a/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt
+++ b/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt
@@ -26,7 +26,4 @@ layer at (0,0) size 800x600
             text run at (2,2) width 40: "test "
           RenderText {TEXT} at (42,2) size 34x28
             text run at (42,2) width 34: "test"
-selection is CARET:
-start:      position 4 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 4 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 4 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 4 of child 1 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt b/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt
index 58edc9e05d39b9cfaffdb7af9bac97d2ce6d57c9..c5cc9de793e1eaebb6b3a9a6804d09379862522d 100644 (file)
--- a/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt
+++ b/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt
@@ -26,7 +26,4 @@ layer at (0,0) size 800x600
             text run at (2,2) width 34: "test"
           RenderText {TEXT} at (36,2) size 40x28
             text run at (36,2) width 40: " test"
-selection is CARET:
-start:      position 4 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 4 of child 0 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt b/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt
index a237d3bee0a74716ff27880a46c290241a2e5efd..71c1b0b9d9f3d3759e8fef23cd0f1869eedbe6db 100644 (file)
--- a/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt
+++ b/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt
@@ -29,7 +29,4 @@ layer at (0,0) size 800x600
             text run at (36,2) width 40: " test"
           RenderText {TEXT} at (76,2) size 40x28
             text run at (76,2) width 40: " test"
-selection is CARET:
-start:      position 5 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 5 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 5 of child 1 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt b/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt
index 850642049f994c557910cac256a263ee303abab8..2e591b7157462b43743699c8caf1a1b02f071e84 100644 (file)
--- a/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt
+++ b/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt
@@ -29,7 +29,4 @@ layer at (0,0) size 800x600
             text run at (42,2) width 40: "test "
           RenderText {TEXT} at (82,2) size 34x28
             text run at (82,2) width 34: "test"
-selection is CARET:
-start:      position 5 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 5 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 5 of child 1 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt b/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt
index 8be680668e317927f982dc293c1d3ba639e115c6..662670904a6e90687f0443d21d08c7693cd088fa 100644 (file)
--- a/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt
+++ b/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt
@@ -28,7 +28,4 @@ layer at (0,0) size 800x600
             text run at (20,2) width 46: " test "
           RenderText {TEXT} at (66,2) size 16x28
             text run at (66,2) width 16: "st"
-selection is CARET:
-start:      position 6 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 6 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 6 of child 1 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/smart-paste-006-expected.txt b/LayoutTests/editing/pasteboard/smart-paste-006-expected.txt
index 343adc3a30ddf821aec6cad572cafd93756cf68e..e0a269cff5972982d2671af8bb3d1822c1d77c55 100644 (file)
--- a/LayoutTests/editing/pasteboard/smart-paste-006-expected.txt
+++ b/LayoutTests/editing/pasteboard/smart-paste-006-expected.txt
@@ -28,7 +28,4 @@ layer at (0,0) size 800x600
             text run at (10,2) width 34: "test"
           RenderText {TEXT} at (44,2) size 8x28
             text run at (44,2) width 8: "-"
-selection is CARET:
-start:      position 4 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 4 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 4 of child 1 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt b/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt
index 2e2ee2e8f21b059421014e36c1579103f8119201..43785adb64d04a2044bf8743e66712abf7150651 100644 (file)
--- a/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt
+++ b/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt
@@ -28,7 +28,4 @@ layer at (0,0) size 800x600
             text run at (8,2) width 40: " test"
           RenderText {TEXT} at (48,2) size 6x28
             text run at (48,2) width 6: "."
-selection is CARET:
-start:      position 5 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 5 of child 2 {TEXT} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 5 of child 1 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/extend-by-character-001-expected.txt b/LayoutTests/editing/selection/extend-by-character-001-expected.txt
index f305ffabab5821d5109ec306d319a4077d207c00..340053fc55c8a0d383d76abcc89af67bc97a14f6 100644 (file)
--- a/LayoutTests/editing/selection/extend-by-character-001-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-001-expected.txt
@@ -11,10 +11,5 @@ layer at (0,0) size 800x600
             text run at (58,14) width 37: "bar "
             text run at (95,14) width 34: "baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 5 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 5 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-end:        position 14 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 14 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 17 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+selection start: position 5 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 14 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/extend-by-character-002-expected.txt b/LayoutTests/editing/selection/extend-by-character-002-expected.txt
index a083054d3b4aa36a278becf52f19ebb3fec02e3b..5e58ed4a6f3fb93a57955faea9a6fc78510bd42d 100644 (file)
--- a/LayoutTests/editing/selection/extend-by-character-002-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-002-expected.txt
@@ -25,10 +25,5 @@ layer at (0,0) size 800x600
             text run at (14,313) width 61: "nation"
           RenderImage {IMG} at (75,232) size 76x103
         RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-end:        position 6 of child 11 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 6 of child 11 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 12 {IMG} of child 2 {SPAN} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 6 of child 10 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/extend-by-character-003-expected.txt b/LayoutTests/editing/selection/extend-by-character-003-expected.txt
index bc6d1462449b887856e59943a81c276b99ead03a..471d776b7872595bca47c12042d8a865f4b46027 100644 (file)
--- a/LayoutTests/editing/selection/extend-by-character-003-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-003-expected.txt
@@ -23,10 +23,5 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 220x28
             text run at (14,70) width 220: "men are created equal."
         RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 5 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-downstream: position 5 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-end:        position 21 of child 6 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 21 of child 6 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 21 of child 6 {TEXT} of child 2 {SPAN} of root {DIV}
+selection start: position 5 of child 0 {TEXT} of child 0 {I} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 21 of child 5 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/extend-by-character-004-expected.txt b/LayoutTests/editing/selection/extend-by-character-004-expected.txt
index d8dddd6423c338fb2a870c1c9d7d4af4dc93eb07..e8a4bbd2c82ce508ff63696c87bb6bf112ea34d2 100644 (file)
--- a/LayoutTests/editing/selection/extend-by-character-004-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-004-expected.txt
@@ -24,10 +24,5 @@ layer at (0,0) size 800x600
             text run at (14,313) width 61: "nation"
           RenderImage {IMG} at (75,232) size 76x103
         RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-end:        position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/extend-by-character-005-expected.txt b/LayoutTests/editing/selection/extend-by-character-005-expected.txt
index b5761714b270921cd99fab4970ea8959958c4200..f634703ed41fdf2ce602aa3dcf1741ffdea748e9 100644 (file)
--- a/LayoutTests/editing/selection/extend-by-character-005-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-005-expected.txt
@@ -23,10 +23,5 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 220x28
             text run at (14,70) width 220: "men are created equal."
         RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-end:        position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 0 {I} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 0 {TEXT} of child 0 {I} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/extend-by-character-006-expected.txt b/LayoutTests/editing/selection/extend-by-character-006-expected.txt
index 5c5d06f542e35f220ef9d852e77b6f881a33d441..cabad9d61b81b6ddc829603767a182884d4a6fca 100644 (file)
--- a/LayoutTests/editing/selection/extend-by-character-006-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-006-expected.txt
@@ -10,10 +10,5 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is RANGE:
-start:      position 1 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 1 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-end:        position 4 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-upstream:   position 4 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-downstream: position 0 of child 5 {TEXT} of root {DIV}
+selection start: position 1 of child 0 {TEXT} of child 0 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 4 of child 0 {TEXT} of child 0 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-3875618-fix-expected.txt b/LayoutTests/editing/selection/move-3875618-fix-expected.txt
index ca6f96fb684400d005aea4bfc26d270fb3dcd077..ebdd843ecf3812cbc5d09f74dc73072ee5675a37 100644 (file)
--- a/LayoutTests/editing/selection/move-3875618-fix-expected.txt
+++ b/LayoutTests/editing/selection/move-3875618-fix-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (14,70) size 756x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 3 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 1 of child 2 {BR} of child 1 {DIV} of root {BODY}
-downstream: position 0 of child 3 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 0 of child 2 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-3875641-fix-expected.txt b/LayoutTests/editing/selection/move-3875641-fix-expected.txt
index 2c58e42104186b451ba4e959cea19e5ff000bb1b..da26fc4ddaffbf43cd841f78197cae4815d709f1 100644 (file)
--- a/LayoutTests/editing/selection/move-3875641-fix-expected.txt
+++ b/LayoutTests/editing/selection/move-3875641-fix-expected.txt
@@ -12,7 +12,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (14,70) size 756x28
         RenderText {TEXT} at (0,0) size 241x28
           text run at (0,0) width 241: "Which taken at the flood"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
-upstream:   position 0 of child 2 {DIV} of root {BODY}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {BODY}
+caret: position 0 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-backwords-by-word-001-expected.txt b/LayoutTests/editing/selection/move-backwords-by-word-001-expected.txt
index 3472e08afd4050ca11529dbd9d7b21ad59deddd7..2ecaec2e1fa7db8504d88dbe23c3f02d319b6f92 100644 (file)
--- a/LayoutTests/editing/selection/move-backwords-by-word-001-expected.txt
+++ b/LayoutTests/editing/selection/move-backwords-by-word-001-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,42) size 71x28
             text run at (14,42) width 71: "bar baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 2 {BR} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 0 of child 2 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-between-blocks-no-001-expected.txt b/LayoutTests/editing/selection/move-between-blocks-no-001-expected.txt
index 2371a1319008c80fed8eba8d60b4fa0ef423bd80..fba00111139b2b65c0e4a1ac75de4bf32987ada5 100644 (file)
--- a/LayoutTests/editing/selection/move-between-blocks-no-001-expected.txt
+++ b/LayoutTests/editing/selection/move-between-blocks-no-001-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 244x28
           text run at (14,14) width 244: "men are created equal, ..."
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-upstream:   position 0 of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
-downstream: position 0 of child 1 {TEXT} of child 4 {DIV} of child 2 {BODY} of child 1 {HTML} of root {}
+caret: position 0 of child 0 {TEXT} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-between-blocks-yes-001-expected.txt b/LayoutTests/editing/selection/move-between-blocks-yes-001-expected.txt
index 5e8fd28a675cfd48dd8aeef008d94ba3000cdc41..22490ae5bc42fb88bcb116d7a3501df8dfa69062 100644 (file)
--- a/LayoutTests/editing/selection/move-between-blocks-yes-001-expected.txt
+++ b/LayoutTests/editing/selection/move-between-blocks-yes-001-expected.txt
@@ -11,7 +11,4 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
         RenderText {TEXT} at (14,14) size 318x28
           text run at (14,14) width 318: "that all men are created equal, ..."
-selection is CARET:
-start:      position 9 of child 1 {TEXT} of child 4 {DIV} of root {BODY}
-upstream:   position 9 of child 1 {TEXT} of child 4 {DIV} of root {BODY}
-downstream: position 9 of child 1 {TEXT} of child 4 {DIV} of root {BODY}
+caret: position 9 of child 0 {TEXT} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-by-character-001-expected.txt b/LayoutTests/editing/selection/move-by-character-001-expected.txt
index 557060cf1b6d2a4376660db43bfb7df7a553aa6d..19ae9025a6be1ef022c69990c45915c5b7e63d1e 100644 (file)
--- a/LayoutTests/editing/selection/move-by-character-001-expected.txt
+++ b/LayoutTests/editing/selection/move-by-character-001-expected.txt
@@ -10,7 +10,4 @@ layer at (0,0) size 800x600
             text run at (52,14) width 37: "bar "
             text run at (89,14) width 34: "baz"
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 16 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 16 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 3 {TEXT} of root {DIV}
+caret: position 16 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-by-character-002-expected.txt b/LayoutTests/editing/selection/move-by-character-002-expected.txt
index 227120551ec44edfa6a1adba0fc8a5a6dffe9db5..2cf0bba0bb49e602256e785af0431846fe9405c9 100644 (file)
--- a/LayoutTests/editing/selection/move-by-character-002-expected.txt
+++ b/LayoutTests/editing/selection/move-by-character-002-expected.txt
@@ -24,7 +24,4 @@ layer at (0,0) size 800x600
             text run at (14,313) width 61: "nation"
           RenderImage {IMG} at (75,232) size 76x103
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 6 of child 11 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 6 of child 11 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 12 {IMG} of child 2 {SPAN} of root {DIV}
+caret: position 6 of child 10 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-by-character-003-expected.txt b/LayoutTests/editing/selection/move-by-character-003-expected.txt
index 986a5a5166ae4632e7209b067c24f0fc85fa1a49..9ff2c08139f870eccf66e6c56aa7c04afe7fb2af 100644 (file)
--- a/LayoutTests/editing/selection/move-by-character-003-expected.txt
+++ b/LayoutTests/editing/selection/move-by-character-003-expected.txt
@@ -23,7 +23,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 220x28
             text run at (14,70) width 220: "men are created equal."
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 21 of child 6 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 21 of child 6 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 21 of child 6 {TEXT} of child 2 {SPAN} of root {DIV}
+caret: position 21 of child 5 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-by-character-004-expected.txt b/LayoutTests/editing/selection/move-by-character-004-expected.txt
index 7049d50253cf365affb1b2794b46c13ca2cd5cae..5b9a352973c1f068cef6b894b935a90542dfcfbf 100644 (file)
--- a/LayoutTests/editing/selection/move-by-character-004-expected.txt
+++ b/LayoutTests/editing/selection/move-by-character-004-expected.txt
@@ -24,7 +24,4 @@ layer at (0,0) size 800x600
             text run at (14,313) width 61: "nation"
           RenderImage {IMG} at (75,232) size 76x103
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {IMG} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-by-character-005-expected.txt b/LayoutTests/editing/selection/move-by-character-005-expected.txt
index 6221e229ffabc2d3ec2cedd8191b9dce0d5dde7f..51b1cf032a7a2d55382536f6816cdbd90eb7649f 100644 (file)
--- a/LayoutTests/editing/selection/move-by-character-005-expected.txt
+++ b/LayoutTests/editing/selection/move-by-character-005-expected.txt
@@ -23,7 +23,4 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,70) size 220x28
             text run at (14,70) width 220: "men are created equal."
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-upstream:   position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
-downstream: position 1 of child 1 {TEXT} of child 1 {I} of child 2 {SPAN} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 0 {I} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-by-line-001-expected.txt b/LayoutTests/editing/selection/move-by-line-001-expected.txt
index 89b6f04da6e4e8e62fe64ac8eb6837dc178e2f7a..11038f4283cbfc31e0caea5a80fc2568d7101cdc 100644 (file)
--- a/LayoutTests/editing/selection/move-by-line-001-expected.txt
+++ b/LayoutTests/editing/selection/move-by-line-001-expected.txt
@@ -17,7 +17,4 @@ layer at (0,0) size 800x600
                 RenderTableCell {TD} at (2,108) size 58x54 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
                   RenderText {TEXT} at (13,13) size 31x28
                     text run at (13,13) width 31: "bar"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 1 {TD} of child 3 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 1 {TD} of child 3 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
-downstream: position 3 of child 1 {TEXT} of child 1 {TD} of child 3 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 0 {TD} of child 2 {TR} of child 1 {TBODY} of child 0 {TABLE} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/move-by-word-001-expected.txt b/LayoutTests/editing/selection/move-by-word-001-expected.txt
index 45e36995b1277e992d111c5a284d5471de857d1d..b36bbf960933bb2d46bac2fb501931a30fef1cb8 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-001-expected.txt
+++ b/LayoutTests/editing/selection/move-by-word-001-expected.txt
@@ -10,10 +10,5 @@ layer at (0,0) size 800x600
         RenderBlock (anonymous) at (14,42) size 756x28
           RenderText {TEXT} at (0,0) size 31x28
             text run at (0,0) width 31: "bar"
-selection is RANGE:
-start:      position 0 of child 3 {TEXT} of root {DIV}
-upstream:   position 0 of child 3 {TEXT} of root {DIV}
-downstream: position 0 of child 3 {TEXT} of root {DIV}
-end:        position 3 of child 3 {TEXT} of root {DIV}
-upstream:   position 3 of child 3 {TEXT} of root {DIV}
-downstream: position 4 of child 3 {TEXT} of root {DIV}
+selection start: position 0 of child 2 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 3 of child 2 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/select-all-001-expected.txt b/LayoutTests/editing/selection/select-all-001-expected.txt
index fe5f86c0abc87131ba0a69d8d34b16b8173932c4..201c0b28504b35c2ead2fb54fa4e13669cc1a096 100644 (file)
--- a/LayoutTests/editing/selection/select-all-001-expected.txt
+++ b/LayoutTests/editing/selection/select-all-001-expected.txt
@@ -19,10 +19,5 @@ layer at (0,0) size 820x900
             text run at (0,490) width 598: "brought forth, upon this continent, a new nation, conceived in"
             text run at (0,538) width 554: "Liberty, and dedicated to the proposition that all men are"
             text run at (0,586) width 136: "created equal."
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-end:        position 736 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 736 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 737 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 736 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/select-all-002-expected.txt b/LayoutTests/editing/selection/select-all-002-expected.txt
index b9a7d5d960902862123534696c9dea3ad1dd7b16..aa76eed826bd19897a8f9d8d62ff730bbf5fe9bd 100644 (file)
--- a/LayoutTests/editing/selection/select-all-002-expected.txt
+++ b/LayoutTests/editing/selection/select-all-002-expected.txt
@@ -25,10 +25,5 @@ layer at (0,0) size 820x900
             text run at (0,490) width 552: "Four score and seven years ago our fathers brought forth,"
             text run at (0,538) width 583: "upon this continent, a new nation, conceived in Liberty, and"
             text run at (0,586) width 571: "dedicated to the proposition that all men are created equal."
-selection is RANGE:
-start:      position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
-end:        position 180 of child 7 {TEXT} of child 2 {DIV} of root {DIV}
-upstream:   position 180 of child 7 {TEXT} of child 2 {DIV} of root {DIV}
-downstream: position 181 of child 7 {TEXT} of child 2 {DIV} of root {DIV}
+selection start: position 0 of child 0 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 180 of child 6 {TEXT} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/select-all-003-expected.txt b/LayoutTests/editing/selection/select-all-003-expected.txt
index ba9e58aa6a21f9f33276a9ab4969a5954683ad6c..86c6f8048598cedfb5def4ae160f323f220280e2 100644 (file)
--- a/LayoutTests/editing/selection/select-all-003-expected.txt
+++ b/LayoutTests/editing/selection/select-all-003-expected.txt
@@ -23,10 +23,5 @@ layer at (0,0) size 812x1044
         RenderBR {BR} at (0,0) size 0x0
         RenderBR {BR} at (0,730) size 0x48
       RenderBlock {DIV} at (74,842) size 600x0
-selection is RANGE:
-start:      position 0 of child 1 {BR} of root {BODY}
-upstream:   position 0 of  of root {BODY}
-downstream: position 0 of child 1 {BR} of root {BODY}
-end:        position 1 of child 5 {BR} of root {BODY}
-upstream:   position 1 of child 5 {BR} of root {BODY}
-downstream: position 0 of child 7 {BR} of root {BODY}
+selection start: position 0 of child 0 {BR} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 4 {BR} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/select-all-004-expected.txt b/LayoutTests/editing/selection/select-all-004-expected.txt
index 35fce3b3e3364f7ef1a0658d28a4b04606a2da06..6e6d78ade8ea4ba826d28a4c80cd94543938ed58 100644 (file)
--- a/LayoutTests/editing/selection/select-all-004-expected.txt
+++ b/LayoutTests/editing/selection/select-all-004-expected.txt
@@ -13,10 +13,5 @@ layer at (0,0) size 812x585
             RenderTableCell {TD} at (2,2) size 2x2 [r=0 c=0 rs=1 cs=1]
       RenderBlock (anonymous) at (74,128) size 600x48
         RenderBR {BR} at (0,10) size 0x48
-selection is RANGE:
-start:      position 1 of child 2 {TEXT} of root {BODY}
-upstream:   position 0 of child 2 {TEXT} of root {BODY}
-downstream: position 1 of child 2 {TEXT} of root {BODY}
-end:        position 0 of child 4 {TEXT} of root {BODY}
-upstream:   position 0 of child 4 {TEXT} of root {BODY}
-downstream: position 0 of child 5 {BR} of root {BODY}
+selection start: position 1 of child 1 {TEXT} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 0 of child 3 {TEXT} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/selection-3748164-fix-expected.txt b/LayoutTests/editing/selection/selection-3748164-fix-expected.txt
index 284d8ff7444ca1ab6f9c2b6f3c2117a9f71f2385..cf3f92098f42a281e492984937fda23922261ba4 100644 (file)
--- a/LayoutTests/editing/selection/selection-3748164-fix-expected.txt
+++ b/LayoutTests/editing/selection/selection-3748164-fix-expected.txt
@@ -13,7 +13,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
-start:      position 5 of child 1 {TEXT} of child 4 {SPAN} of child 2 {DIV} of root {DIV}
-upstream:   position 5 of child 1 {TEXT} of child 4 {SPAN} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 5 {BR} of child 2 {DIV} of root {DIV}
+caret: position 5 of child 0 {TEXT} of child 3 {SPAN} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/unrendered-001-expected.txt b/LayoutTests/editing/selection/unrendered-001-expected.txt
index baf66b39619736cebd243e3019c89d3640c2948f..892ba7a38d72b9e2d958e3ba48b9bae56c9391a0 100644 (file)
--- a/LayoutTests/editing/selection/unrendered-001-expected.txt
+++ b/LayoutTests/editing/selection/unrendered-001-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 40x48
           text run at (106,84) width 40: " baz"
-selection is CARET:
-start:      position 0 of child 4 {TEXT} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of root {DIV}
+caret: position 0 of child 3 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/unrendered-002-expected.txt b/LayoutTests/editing/selection/unrendered-002-expected.txt
index 0dc69f11be80a6fdf7e47ba6b0b2643610ebe406..002e1cc861db292ee653942e52cbc921ef55fb5b 100644 (file)
--- a/LayoutTests/editing/selection/unrendered-002-expected.txt
+++ b/LayoutTests/editing/selection/unrendered-002-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 40x48
           text run at (106,84) width 40: " baz"
-selection is CARET:
-start:      position 1 of child 4 {TEXT} of root {DIV}
-upstream:   position 1 of child 4 {TEXT} of root {DIV}
-downstream: position 1 of child 4 {TEXT} of root {DIV}
+caret: position 1 of child 3 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/unrendered-003-expected.txt b/LayoutTests/editing/selection/unrendered-003-expected.txt
index 8523c5d9781135bbc87d9e3359bc716143796109..f95834d5eeea33f97890dea9c8d45aa5b0e6dffe 100644 (file)
--- a/LayoutTests/editing/selection/unrendered-003-expected.txt
+++ b/LayoutTests/editing/selection/unrendered-003-expected.txt
@@ -9,10 +9,5 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 40x48
           text run at (106,84) width 40: " baz"
-selection is RANGE:
-start:      position 0 of child 4 {TEXT} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of root {DIV}
-end:        position 1 of child 4 {TEXT} of root {DIV}
-upstream:   position 1 of child 4 {TEXT} of root {DIV}
-downstream: position 1 of child 4 {TEXT} of root {DIV}
+selection start: position 0 of child 3 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 3 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/unrendered-004-expected.txt b/LayoutTests/editing/selection/unrendered-004-expected.txt
index e60585a1eb9e837941dc24f0c7e876bcef7f9733..21e17ad5809da24815dabb6a0d36a9cff22eb0f6 100644 (file)
--- a/LayoutTests/editing/selection/unrendered-004-expected.txt
+++ b/LayoutTests/editing/selection/unrendered-004-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 40x48
           text run at (106,84) width 40: " baz"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/unrendered-005-expected.txt b/LayoutTests/editing/selection/unrendered-005-expected.txt
index e60585a1eb9e837941dc24f0c7e876bcef7f9733..21e17ad5809da24815dabb6a0d36a9cff22eb0f6 100644 (file)
--- a/LayoutTests/editing/selection/unrendered-005-expected.txt
+++ b/LayoutTests/editing/selection/unrendered-005-expected.txt
@@ -9,7 +9,4 @@ layer at (0,0) size 820x585
             text run at (74,84) width 32: "foo"
         RenderText {TEXT} at (106,84) size 40x48
           text run at (106,84) width 40: " baz"
-selection is CARET:
-start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 4 {TEXT} of root {DIV}
+caret: position 3 of child 0 {TEXT} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/block-style-001-expected.txt b/LayoutTests/editing/style/block-style-001-expected.txt
index 7342e81c6e273f5e84f34e65d25b6e71d8841fbe..a95c24e036e61e0169dfe72598d254559912af8c 100644 (file)
--- a/LayoutTests/editing/style/block-style-001-expected.txt
+++ b/LayoutTests/editing/style/block-style-001-expected.txt
@@ -19,7 +19,4 @@ layer at (0,0) size 800x600
             text run at (298,14) width 90: "flush left"
         RenderText {TEXT} at (388,14) size 6x28
           text run at (388,14) width 6: "."
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/block-style-002-expected.txt b/LayoutTests/editing/style/block-style-002-expected.txt
index 7342e81c6e273f5e84f34e65d25b6e71d8841fbe..a95c24e036e61e0169dfe72598d254559912af8c 100644 (file)
--- a/LayoutTests/editing/style/block-style-002-expected.txt
+++ b/LayoutTests/editing/style/block-style-002-expected.txt
@@ -19,7 +19,4 @@ layer at (0,0) size 800x600
             text run at (298,14) width 90: "flush left"
         RenderText {TEXT} at (388,14) size 6x28
           text run at (388,14) width 6: "."
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
+caret: position 1 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/block-style-003-expected.txt b/LayoutTests/editing/style/block-style-003-expected.txt
index 0ee67b3e2dd9463f33587ffee649b785c08d954e..85a54ddf4ee0bdbc7bf3de1563bda7ac0c3adc22 100644 (file)
--- a/LayoutTests/editing/style/block-style-003-expected.txt
+++ b/LayoutTests/editing/style/block-style-003-expected.txt
@@ -19,10 +19,5 @@ layer at (0,0) size 800x600
             text run at (486,14) width 89: "centered"
         RenderText {TEXT} at (575,14) size 6x28
           text run at (575,14) width 6: "."
-selection is RANGE:
-start:      position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-upstream:   position 0 of child 1 {DIV} of root {BODY}
-downstream: position 1 of child 1 {TEXT} of child 1 {DIV} of root {BODY}
-end:        position 12 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-upstream:   position 12 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
-downstream: position 12 of child 1 {TEXT} of child 3 {DIV} of root {BODY}
+selection start: position 1 of child 0 {TEXT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 12 of child 0 {TEXT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/block-style-004-expected.txt b/LayoutTests/editing/style/block-style-004-expected.txt
index 580ca67bdf22fa0b70ea1ccc2e71cc812f1f9474..150f4ab98c4f31e4ff0ccdc2922cbb19a767119a 100644 (file)
--- a/LayoutTests/editing/style/block-style-004-expected.txt
+++ b/LayoutTests/editing/style/block-style-004-expected.txt
@@ -37,7 +37,4 @@ layer at (0,0) size 800x600
             RenderInline {SPAN} at (0,0) size 30x69
               RenderText {TEXT} at (0,0) size 30x69
                 text run at (0,0) width 30: "x"
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 1 {SPAN} of child 1 {FONT} of child 3 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 1 {SPAN} of child 1 {FONT} of child 3 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/block-style-005-expected.txt b/LayoutTests/editing/style/block-style-005-expected.txt
index bdd33c3e2d3a9d174cadbd2f0cd1203870abad21..6b95be655c0d4aa5e9fe45b9c9c01afcf2100f25 100644 (file)
--- a/LayoutTests/editing/style/block-style-005-expected.txt
+++ b/LayoutTests/editing/style/block-style-005-expected.txt
@@ -34,7 +34,4 @@ layer at (0,0) size 800x600
           RenderInline {FONT} at (0,0) size 0x55
             RenderInline {SPAN} at (0,0) size 0x69
               RenderBR {BR} at (0,0) size 0x69
-selection is CARET:
-start:      position 0 of child 1 {BR} of child 1 {SPAN} of child 1 {FONT} of child 3 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {DIV} of root {DIV}
-downstream: position 0 of child 1 {BR} of child 1 {SPAN} of child 1 {FONT} of child 3 {DIV} of root {DIV}
+caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/block-style-006-expected.txt b/LayoutTests/editing/style/block-style-006-expected.txt
index 0a899f316890f0d6def969fbbbf1bd1f6210ce58..204eb803a4d4423250d5f7608f8b256048636ddb 100644 (file)
--- a/LayoutTests/editing/style/block-style-006-expected.txt
+++ b/LayoutTests/editing/style/block-style-006-expected.txt
@@ -39,7 +39,4 @@ layer at (0,0) size 800x600
             RenderInline {SPAN} at (0,0) size 30x69
               RenderText {TEXT} at (0,0) size 30x69
                 text run at (0,0) width 30: "x"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {SPAN} of child 1 {FONT} of child 4 {DIV} of root {DIV}
-upstream:   position 0 of child 4 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {SPAN} of child 1 {FONT} of child 4 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 0 {SPAN} of child 0 {FONT} of child 3 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/block-styles-007-expected.txt b/LayoutTests/editing/style/block-styles-007-expected.txt
index 1949aaa67e41923c30f37051c78bfccbe19249dc..28a97b9dfc3f41f50801b85a5dcbd5d4a01d4297 100644 (file)
--- a/LayoutTests/editing/style/block-styles-007-expected.txt
+++ b/LayoutTests/editing/style/block-styles-007-expected.txt
@@ -41,7 +41,4 @@ layer at (0,0) size 800x600
             RenderInline {B} at (0,0) size 36x28
               RenderText {TEXT} at (0,0) size 36x28
                 text run at (0,0) width 36: "bar"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {B} of child 2 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 2 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {B} of child 2 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 0 {B} of child 1 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/create-block-for-style-001-expected.txt b/LayoutTests/editing/style/create-block-for-style-001-expected.txt
index b03110e4c3ab488c95a63ba3778369fd47059864..ec364a2293521e16a5e4ae732f43a666a4d06f7e 100644 (file)
--- a/LayoutTests/editing/style/create-block-for-style-001-expected.txt
+++ b/LayoutTests/editing/style/create-block-for-style-001-expected.txt
@@ -18,7 +18,4 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,42) size 34x28
             text run at (14,42) width 34: "baz"
-selection is CARET:
-start:      position 1 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 1 {DIV} of root {DIV}
-downstream: position 1 of child 1 {TEXT} of child 1 {DIV} of root {DIV}
+caret: position 1 of child 0 {TEXT} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/create-block-for-style-002-expected.txt b/LayoutTests/editing/style/create-block-for-style-002-expected.txt
index 3035ec11bc54b91ac151d68fee3df90a99a81e25..4b2011514cd669417722f2d9ee441507ae0d5661 100644 (file)
--- a/LayoutTests/editing/style/create-block-for-style-002-expected.txt
+++ b/LayoutTests/editing/style/create-block-for-style-002-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (14,98) size 756x28
             RenderText {TEXT} at (0,0) size 34x28
               text run at (0,0) width 34: "baz"
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 3 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 3 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 2 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/create-block-for-style-003-expected.txt b/LayoutTests/editing/style/create-block-for-style-003-expected.txt
index d6dffe1860ca61b0d7f8d62bcf59a865cbd111b6..aa450a94e760f17210d46fbefcff176da0a4d1fe 100644 (file)
--- a/LayoutTests/editing/style/create-block-for-style-003-expected.txt
+++ b/LayoutTests/editing/style/create-block-for-style-003-expected.txt
@@ -20,7 +20,4 @@ layer at (0,0) size 800x600
             RenderText {TEXT} at (361,14) size 34x28
               text run at (361,14) width 34: "baz"
           RenderBlock (anonymous) at (14,126) size 756x0
-selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 5 {DIV} of child 1 {DIV} of root {DIV}
-upstream:   position 0 of child 5 {DIV} of child 1 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 5 {DIV} of child 1 {DIV} of root {DIV}
+caret: position 0 of child 0 {TEXT} of child 4 {DIV} of child 0 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/style/create-block-for-style-004-expected.txt b/LayoutTests/editing/style/create-block-for-style-004-expected.txt
index 9cf2cbbe1e4e6702fb5b1581900c1d8a98b635fe..5ce394b4f7b3d977e3d56ca4eaeb640636712688 100644 (file)
--- a/LayoutTests/editing/style/create-block-for-style-004-expected.txt
+++ b/LayoutTests/editing/style/create-block-for-style-004-expected.txt
@@ -21,7 +21,4 @@ layer at (0,0) size 800x600
      &nb