diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 18:10:20 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 18:10:20 +0000 |
commit | 98093f06f0995b367a6e9cf5a21c355386474e95 (patch) | |
tree | 224f97e73bcb294a95f9549e3228c049671ce84a /webkit | |
parent | 5e222a04a5f6ed8702d842780060f72bcd20421d (diff) | |
download | chromium_src-98093f06f0995b367a6e9cf5a21c355386474e95.zip chromium_src-98093f06f0995b367a6e9cf5a21c355386474e95.tar.gz chromium_src-98093f06f0995b367a6e9cf5a21c355386474e95.tar.bz2 |
Re-baseline and create baselines for tests added in http://trac.webkit.org/changeset/43215
BUG=11483
R=dglazkov
Review URL: http://codereview.chromium.org/112003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
199 files changed, 325 insertions, 287 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4845371-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4845371-expected.txt index 673d0e0..c15c8d4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4845371-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4845371-expected.txt @@ -26,4 +26,4 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (6,2) size 23x22 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 21x19 text run at (1,1) width 21: "baz" -caret: position 0 of child 0 {BR} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4866671-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4866671-expected.txt index c30918f..ac682d2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4866671-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4866671-expected.txt @@ -19,4 +19,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (40,40) size 744x103 RenderInline {SPAN} at (0,0) size 76x15 RenderImage {IMG} at (0,0) size 76x103 -caret: position 0 of child 0 {BR} of child 1 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 1 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4875189-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4875189-expected.txt index f2a2ebe..326ab11 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4875189-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/4875189-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderBR {BR} at (96,15) size 0x0 RenderText {#text} at (0,20) size 98x19 text run at (0,20) width 98: "Paragraph Two." -caret: position 14 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 14 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-1-expected.txt index 8b8aaf0..2b004a9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-1-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 246: "see anything in the editable region below." RenderBlock {DIV} at (0,56) size 784x20 RenderBR {BR} at (0,0) size 0x19 -caret: position 0 of child 0 {BR} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-2-expected.txt index bf3fae0..5826d16 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-2-expected.txt @@ -25,4 +25,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (1,1) size 80x19 text run at (1,1) width 80: "Non-editable" RenderBlock (anonymous) at (0,26) size 784x0 -caret: position 9 of child 0 {#text} of child 3 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 9 of child 0 {#text} of child 3 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-3-expected.txt index 4dc719d..4dd61ba 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5026848-3-expected.txt @@ -28,4 +28,4 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (191,2) size 4x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] RenderTableCell {TD} at (197,2) size 4x24 [border: (1px inset #808080)] [r=0 c=3 rs=1 cs=1] RenderBlock (anonymous) at (0,30) size 784x0 -caret: position 9 of child 0 {#text} of child 3 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 9 of child 0 {#text} of child 3 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5032066-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5032066-expected.txt index ed246a4..09f782f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5032066-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5032066-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 159x19 RenderText {#text} at (223,2) size 159x19 text run at (223,2) width 159: "should be in one table cell." -caret: position 40 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 40 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5091898-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5091898-expected.txt index 6974a98..da759f3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5091898-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5091898-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderInline {DIV} at (0,0) size 157x19 RenderText {#text} at (171,0) size 157x19 text run at (171,0) width 157: "This should be underlined." -caret: position 29 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 29 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5099303-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5099303-expected.txt index eaf39cc..0a142a3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5099303-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5099303-expected.txt @@ -17,4 +17,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,30) size 784x20 RenderText {#text} at (0,0) size 9x19 text run at (0,0) width 9: ")." -caret: position 0 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5115601-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5115601-expected.txt index e4973d5..480b5a5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5115601-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5115601-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 text run at (2,2) width 282: "This sentence should be inside the editable cell." RenderBR {BR} at (284,17) size 0x0 RenderBlock (anonymous) at (0,30) size 784x0 -caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5126166-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5126166-expected.txt index 02b647d..ceaac34 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5126166-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5126166-expected.txt @@ -22,4 +22,4 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (8,2) size 322x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (2,2) size 318x19 text run at (2,2) width 318: "There should be one empty cell to the left of this one." -caret: position 0 of child 0 {BR} of child 3 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 3 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-2-expected.txt index 0555c544..9294144 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-2-expected.txt @@ -15,4 +15,4 @@ layer at (0,0) size 800x600 RenderInline {A} at (0,0) size 47x19 [color=#0000EE] RenderText {#text} at (0,20) size 47x19 text run at (0,20) width 47: "Cached" -caret: position 6 of child 0 {#text} of child 1 {A} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 6 of child 0 {#text} of child 1 {A} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt index 0460c2d..52d7089 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt @@ -19,4 +19,4 @@ layer at (0,0) size 800x600 layer at (10,87) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 RenderBR {BR} at (1,0) size 0x16 -caret: position 0 of child 0 {BR} of child 0 {DIV} of child 3 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 0 {DIV} of child 3 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5272440-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5272440-expected.txt index 5fc951e..f24edf8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5272440-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5272440-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (1,1) size 370x19 text run at (1,1) width 370: "There shouldn't be any blank lines in the black bordered area." RenderBR {BR} at (371,16) size 0x0 -caret: position 62 of child 0 {#text} of child 0 {SPAN} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 62 of child 0 {#text} of child 0 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5300379-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5300379-expected.txt index 6101cd4..d8a48c9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5300379-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5300379-expected.txt @@ -8,4 +8,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 49x19 text run at (0,0) width 49: "Success" RenderBlock {DIV} at (0,20) size 784x0 -caret: position 7 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 7 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5390681-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5390681-expected.txt index 90c3130..e8fdcff 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5390681-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5390681-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 20x19 RenderText {#text} at (0,20) size 20x19 text run at (0,20) width 20: "bar" -caret: position 0 of child 0 {BR} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5408255-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5408255-expected.txt index 28d4f26..ccbc0cb 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5408255-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5408255-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 82: "select:ignore. "
text run at (82,20) width 428: "The list should be removed, the editable region below should be empty."
RenderBlock {DIV} at (0,56) size 784x32
-caret: position 0 of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5433862-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5433862-2-expected.txt index 4fd1977..2eb6cfd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5433862-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5433862-2-expected.txt @@ -42,4 +42,4 @@ layer at (0,0) size 800x600 RenderBR {BR} at (6,6) size 0x19 RenderTableCell {TD} at (70,104) size 33x32 [border: (1px inset #808080)] [r=3 c=2 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 -caret: position 0 of child 0 {BR} of child 0 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 0 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5483370-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5483370-expected.txt index 15282dd..d7e5e80 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5483370-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5483370-expected.txt @@ -19,4 +19,4 @@ layer at (0,0) size 800x600 RenderTableRow {TR} at (0,28) size 26x4 RenderTableCell {TD} at (2,28) size 16x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderTableCell {TD} at (20,28) size 4x4 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] -caret: position 2 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 2 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt index 57abe9a..3c1020b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt @@ -9,4 +9,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 784x20 -caret: position 0 of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-block-table-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-block-table-expected.txt index 5a92c4c..2d50706 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-block-table-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-block-table-expected.txt @@ -46,4 +46,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (34,1) size 20x19 text run at (34,1) width 20: "fter" RenderBlock (anonymous) at (0,76) size 784x0 -caret: position 15 of child 0 {#text} of child 3 {TD} of child 2 {TR} of child 1 {TBODY} of child 3 {TABLE} of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 15 of child 0 {#text} of child 3 {TD} of child 2 {TR} of child 1 {TBODY} of child 3 {TABLE} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt index 06cab5e..8be1d73 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt @@ -24,4 +24,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "fter" RenderText {#text} at (0,0) size 0x0 -caret: position 0 of child 0 {#text} of child 3 {SPAN} of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 3 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt index c72ba5c..d74de99 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt @@ -26,4 +26,4 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -caret: position 0 of child 0 {BR} of child 3 {SPAN} of child 1 {SPAN} of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 3 {SPAN} of child 1 {SPAN} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-to-select-table-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-to-select-table-expected.txt index b037220..b0c77a5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-to-select-table-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-to-select-table-expected.txt @@ -54,5 +54,5 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (31,26) size 43x22 [r=1 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 41x19 text run at (1,1) width 41: "buffalo" -selection start: position 0 of child 1 {TABLE} of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document -selection end: position 2 of child 1 {TABLE} of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 1 {TABLE} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 2 of child 1 {TABLE} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt index 33830c6..527a806 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt @@ -31,4 +31,4 @@ layer at (24,100) size 752x90 layerType: foreground only RenderTableCell (anonymous) at (2,2) size 748x0 [r=0 c=0 rs=1 cs=1]
layer at (7,85) size 30x30
RenderImage zI: 1000000 {IMG} at (-17,-15) size 30x30
-caret: position 403 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+caret: position 403 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-endOfParagraph-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-endOfParagraph-expected.txt index 806bfcd..c30d12e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-endOfParagraph-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-endOfParagraph-expected.txt @@ -31,4 +31,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (5,188) size 774x34 [border: (1px solid #000000)] RenderBlock {DIV} at (6,6) size 762x22 [border: (1px solid #FF0000)] RenderBR {BR} at (1,1) size 0x19 -caret: position 0 of child 0 {BR} of child 0 {DIV} of child 6 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 0 {DIV} of child 6 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-no-br-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-no-br-expected.txt index eac2a71..3020ca8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-no-br-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-no-br-expected.txt @@ -29,4 +29,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (11,69) size 714x20 RenderText {#text} at (0,0) size 29x19 text run at (0,0) width 29: "Four" -caret: position 3 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 3 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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt index aad8cff4..29cf340 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 RenderBlock {PRE} at (0,33) size 784x16 RenderText {#text} at (0,0) size 24x16 text run at (0,0) width 24: "baz" -caret: position 3 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-1-expected.txt index 928853a..1ef203d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-1-expected.txt @@ -26,5 +26,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 224x19 text run at (0,0) width 224: "This paragraph should not be in a list." RenderBR {BR} at (224,15) size 0x0 -selection start: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 35 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 35 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt index 10acf466..1f15d8b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt @@ -24,5 +24,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 234x19 text run at (0,0) width 234: "This paragraph should not be indented." RenderBR {BR} at (234,15) size 0x0 -selection start: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 34 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 34 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4747450-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4747450-expected.txt index 32dc1f1..bea42d1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4747450-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4747450-expected.txt @@ -23,4 +23,4 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderBR {BR} at (0,0) size 0x19 RenderBlock (anonymous) at (0,36) size 784x0 -caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-1-expected.txt index b1f141a..012abe9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-1-expected.txt @@ -11,5 +11,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,56) size 784x20 [color=#000000] RenderText {#text} at (0,0) size 69x19 text run at (0,0) width 69: "foo bar baz" -selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 11 of child 0 {#text} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 11 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-2-expected.txt index 620cbac..4907ea8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4786404-2-expected.txt @@ -10,5 +10,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,56) size 784x20 RenderText {#text} at (0,0) size 69x19 text run at (0,0) width 69: "foo bar baz" -selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 11 of child 0 {#text} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 11 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916402-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916402-expected.txt index cc4e4a9..89175bfb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916402-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916402-expected.txt @@ -19,4 +19,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "bar" RenderBlock (anonymous) at (0,72) size 784x0 -caret: position 0 of child 0 {#text} of child 0 {LI} of child 1 {OL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 0 {LI} of child 1 {OL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt index 2db23dc..a5c29bb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt @@ -16,5 +16,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,20) size 20x19 text run at (0,20) width 20: "bar" RenderBlock (anonymous) at (0,40) size 784x0 -selection start: position 1 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 2 of child 2 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 1 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 2 of child 2 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916583-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916583-expected.txt index f498120..61d5102 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916583-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916583-expected.txt @@ -17,4 +17,4 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "bar" -caret: position 0 of child 0 {#text} of child 1 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 1 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920488-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920488-expected.txt index f283434..39a6282 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920488-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920488-expected.txt @@ -11,5 +11,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,56) size 784x20 RenderText {#text} at (0,0) size 51x19 text run at (0,0) width 51: "dogfood" -selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 7 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 7 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920742-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920742-1-expected.txt index 21a2a1b..f9e04bd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920742-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4920742-1-expected.txt @@ -19,5 +19,5 @@ layer at (0,0) size 800x600 RenderBR {BR} at (20,15) size 0x0 RenderBR {BR} at (0,20) size 0x19 RenderBR {BR} at (0,40) size 0x19 -selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 2 {BR} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 2 {BR} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4924441-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4924441-expected.txt index 419d2d0..ba4f6a9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4924441-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4924441-expected.txt @@ -16,4 +16,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "foo" RenderBlock (anonymous) at (0,36) size 784x0 -caret: position 3 of child 0 {#text} of child 0 {LI} of child 0 {OL} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 of child 0 {#text} of child 0 {LI} of child 0 {OL} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5049671-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5049671-expected.txt index eccf278..9cc5a5b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5049671-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5049671-expected.txt @@ -11,5 +11,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,56) size 784x20 RenderText {#text} at (0,0) size 224x19 text run at (0,0) width 224: "This shouldn't be a link or underlined." -selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 39 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 39 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-1-expected.txt index f2e38c4..1aab2c2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-1-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,123) size 784x20 RenderText {#text} at (0,0) size 21x19 text run at (0,0) width 21: "baz" -caret: position 0 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-2-expected.txt index 52ee88d..0a2dddd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5080333-2-expected.txt @@ -18,5 +18,5 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,123) size 784x20 RenderText {#text} at (0,0) size 21x19 text run at (0,0) width 21: "baz" -selection start: position 0 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5119244-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5119244-expected.txt index 2f9749d..cc6358e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5119244-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5119244-expected.txt @@ -20,4 +20,4 @@ layer at (0,0) size 800x600 text run at (1,1) width 84: "ToDo content" RenderBlock (anonymous) at (0,26) size 744x0 RenderBlock (anonymous) at (0,26) size 784x0 -caret: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5120591-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5120591-expected.txt index 3e1f4fb..8d48246 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5120591-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5120591-expected.txt @@ -10,5 +10,5 @@ layer at (0,0) size 800x600 RenderInline {A} at (0,0) size 127x19 [color=#0000EE] RenderText {#text} at (0,0) size 127x19 text run at (0,0) width 127: "This should be a link." -selection start: position 0 of child 0 {#text} of child 0 {A} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 22 of child 0 {#text} of child 0 {A} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {A} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 22 of child 0 {#text} of child 0 {A} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5136770-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5136770-expected.txt index 1ffcd21..1bc36c2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5136770-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5136770-expected.txt @@ -23,5 +23,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 224x19 text run at (0,0) width 224: "This should be an unordered list item." RenderBlock (anonymous) at (0,76) size 784x0 -selection start: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 38 of child 0 {#text} of child 2 {LI} of child 0 {UL} of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 3 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 38 of child 0 {#text} of child 2 {LI} of child 0 {UL} of child 3 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-1-expected.txt index ec97e6853..bc323e9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-1-expected.txt @@ -22,5 +22,5 @@ layer at (0,0) size 800x600 text run at (0,0) width 15: "W" RenderText {#text} at (15,0) size 29x19 text run at (15,0) width 29: "orld!" -selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-2-expected.txt index a49c19e..484c141 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-2-expected.txt @@ -12,5 +12,5 @@ layer at (0,0) size 800x600 text run at (318,0) width 378: "This paragraph should be a link and should be inside a list item." RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (0,36) size 784x0 -selection start: position 0 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 0 {UL} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 123 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 0 {UL} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 0 {UL} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 123 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 0 {UL} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-3-expected.txt index 9b2f6c7..b94e332 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5142012-3-expected.txt @@ -19,4 +19,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (183,0) size 155x19 text run at (183,0) width 155: " This sentence should not." RenderBlock (anonymous) at (0,40) size 784x0 -caret: position 26 of child 1 {#text} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 26 of child 1 {#text} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5144139-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5144139-1-expected.txt index e24ca18..4bd8256 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5144139-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5144139-1-expected.txt @@ -20,5 +20,5 @@ layer at (0,0) size 800x600 text run at (2,2) width 20: "foo" RenderBlock (anonymous) at (0,50) size 744x0 RenderBlock (anonymous) at (0,66) size 784x0 -selection start: position 0 of child 0 {TABLE} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {TABLE} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {TABLE} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {TABLE} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5164796-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5164796-expected.txt index f3197da..d8b89d1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5164796-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5164796-expected.txt @@ -15,5 +15,5 @@ layer at (0,0) size 800x600 text run at (308,0) width 138: "http://www.apple.com/" RenderText {#text} at (446,0) size 8x19 text run at (446,0) width 8: "}" -selection start: position 0 of child 0 {#text} of child 1 {A} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 21 of child 0 {#text} of child 1 {A} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 1 {A} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 21 of child 0 {#text} of child 1 {A} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5207369-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5207369-expected.txt index 97f1d8ea..47d97c5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5207369-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5207369-expected.txt @@ -26,5 +26,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 29x19 text run at (0,0) width 29: "Four" RenderBlock (anonymous) at (0,96) size 784x0 -selection start: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 4 of child 0 {#text} of child 3 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 4 of child 0 {#text} of child 3 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5210032-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5210032-expected.txt index bd543c2..47c34f4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5210032-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5210032-expected.txt @@ -21,4 +21,4 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderText {#text} at (0,0) size 35x19 text run at (0,0) width 35: "Three" -caret: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-1-expected.txt index 407217b..2db3db5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-1-expected.txt @@ -19,4 +19,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 20: "foo" RenderBlock (anonymous) at (2,22) size 20x20 RenderBR {BR} at (0,0) size 0x19 -caret: position 0 of child 1 {BR} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 1 {BR} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-2-expected.txt index 7cc6f52..9d1ab84 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5432254-2-expected.txt @@ -21,5 +21,5 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (2,38) size 60x0 RenderBlock (anonymous) at (0,46) size 784x20 RenderBR {BR} at (0,0) size 0x19 -selection start: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 0 of child 2 {BR} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 0 of child 2 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt index daf883d..aec3345 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt @@ -28,5 +28,5 @@ layer at (0,0) size 800x600 text run at (2,2) width 29: "Four" RenderBlock (anonymous) at (0,56) size 704x0 RenderBlock (anonymous) at (0,56) size 784x0 -selection start: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5569741-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5569741-expected.txt index 5f9f55d..6811400 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5569741-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5569741-expected.txt @@ -17,4 +17,4 @@ layer at (0,0) size 800x600 RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet RenderBR {BR} at (0,0) size 0x19 -caret: position 0 of child 0 {BR} of child 1 {LI} of child 1 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 1 {LI} of child 1 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5573879-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5573879-expected.txt index 0616b8b..d51728a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5573879-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5573879-expected.txt @@ -14,5 +14,5 @@ layer at (0,0) size 800x600 RenderBR {BR} at (20,15) size 0x0 RenderText {#text} at (0,20) size 20x19 text run at (0,20) width 20: "bar" -selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 3 of child 2 {#text} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 2 {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 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-1-expected.txt index ac2fb2d..d3469d3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-1-expected.txt @@ -12,4 +12,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,99) size 784x20 RenderText {#text} at (0,0) size 292x19 text run at (0,0) width 292: "There should be a single empty H1 block above." -caret: position 0 of child 0 {BR} of child 3 {H1} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 3 {H1} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-2-expected.txt index 900ee92..c41d920 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5700414-2-expected.txt @@ -15,4 +15,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,119) size 784x20 RenderText {#text} at (0,0) size 296x19 text run at (0,0) width 296: "There should be a single empty paragraph above." -caret: position 0 of child 0 {BR} of child 0 {H1} of child 3 {DIV} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 0 {H1} of child 3 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-empty-div-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-empty-div-expected.txt index a17854b..06110f3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-empty-div-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-empty-div-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderBR {BR} at (0,0) size 0x19 RenderBlock (anonymous) at (0,36) size 784x0 -caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/12882-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/12882-expected.txt index 5b98d44..7af17cd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/12882-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/12882-expected.txt @@ -20,4 +20,4 @@ layer at (0,0) size 800x600 text run at (192,0) width 481: " our fathers brought forth on this continent a new nation, conceived in liberty and" text run at (673,0) width 4: " " text run at (0,20) width 353: "dedicated to the proposition that all men are created equal." -caret: position 1 of child 1 {IMG} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 1 {IMG} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4840662-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4840662-expected.txt index 197a067..65e6334 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4840662-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4840662-expected.txt @@ -12,4 +12,4 @@ layer at (0,0) size 800x600 RenderBlock {A} at (0,0) size 784x20 [color=#0000EE] RenderText {#text} at (0,0) size 233x19 text run at (0,0) width 233: "This sentence should all be on one line." -caret: position 40 of child 0 {#text} of child 0 {A} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 40 of child 0 {#text} of child 0 {A} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-1-expected.txt index 352b726..0117c09 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-1-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderText {#text} at (0,0) size 165x19 text run at (0,0) width 165: "This should be in a list item." -caret: position 30 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 30 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-2-expected.txt index 331e36e..8444611 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4875189-2-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderBlock (floating) {DIV} at (0,0) size 276x22 [border: (1px solid #0000FF)] RenderText {#text} at (1,1) size 274x19 text run at (1,1) width 274: "This should be in a floating blue bordered div." -caret: position 47 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 47 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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4959067-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4959067-expected.txt index 22a1ea4..05feb84 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4959067-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4959067-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "foo" RenderBlock {UL} at (0,72) size 784x0 -caret: position 3 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 1 {UL} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 1 {UL} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png Binary files differindex ea40a42..db7e475 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.txt index ada6623..c08076a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.txt @@ -16,4 +16,4 @@ layer at (8,45) size 179x36 clip at (9,46) size 177x34 text run at (0,0) width 0: " " RenderText {#text} at (0,16) size 0x16 text run at (0,16) width 0: " " -caret: position 0 of child 1 {#text} of child 0 {DIV} of child 2 {TEXTAREA} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 1 {#text} of child 0 {DIV} of child 2 {TEXTAREA} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-2-expected.txt index 77723f2..5f1406b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-2-expected.txt @@ -15,4 +15,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 784x20 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "bar" -caret: position 0 of child 2 {BR} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 2 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5002441-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5002441-expected.txt index 42d59da..b2f5eda 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5002441-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5002441-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,20) size 784x20 RenderText {#text} at (0,0) size 330x19 text run at (0,0) width 330: "There should be a single space in the paragraph above." -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5058163-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5058163-2-expected.txt index 18addf6..deaea82 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5058163-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5058163-2-expected.txt @@ -15,4 +15,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 784x20 RenderText {#text} at (0,0) size 638x19 text run at (0,0) width 638: "There should be an empty paragraph before this one, and the caret should be at the start of this paragraph." -caret: position 0 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5156401-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5156401-2-expected.txt index f0097da..36be803 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5156401-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5156401-2-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 395x19 text run at (0,0) width 395: "Everything in this editable region should be in the same paragraph." RenderBR {BR} at (395,15) size 0x0 -caret: position 67 of child 0 {#text} of child 0 {A} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 67 of child 0 {#text} of child 0 {A} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-2-expected.txt index aeca5e8..0e68767 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-2-expected.txt @@ -16,4 +16,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 32: "\x{9}" RenderText {#text} at (32,20) size 20x19 text run at (32,20) width 20: "bar" -caret: position 0 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-3-expected.txt index 3463cfd..73cb11a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5549929-3-expected.txt @@ -16,4 +16,4 @@ layer at (0,0) size 800x600 text run at (20,0) width 12: "\x{9}" RenderBR {BR} at (32,15) size 0x0 RenderBR {BR} at (0,20) size 0x19 -caret: position 0 of child 3 {BR} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 3 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-2-expected.txt index 246ab78..e4d7a9b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-2-expected.txt @@ -15,4 +15,4 @@ layer at (10,67) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 layer at (10,89) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 0 of child 2 {INPUT} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 2 {INPUT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-3-expected.txt index 9b0165e..ec72b9f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5607069-3-expected.txt @@ -21,4 +21,4 @@ layer at (11,68) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 layer at (18,90) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 0 of child 3 {#text} of child 0 {FORM} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 3 {#text} of child 0 {FORM} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-html-element-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-html-element-expected.txt index d075a78..08ddb9a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-html-element-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-html-element-expected.txt @@ -1,4 +1,4 @@ -EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of HTML > #document to 3 of HTML > #document +EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of HTML > #document to 2 of HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 259 of #text > BODY > HTML > #document to 259 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE @@ -23,4 +23,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,40) size 784x20 RenderBR {BR} at (0,0) size 0x19 -caret: position 0 of child 0 {BR} of child 2 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-inline-element-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-inline-element-expected.txt index 39e3554..80db1a0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-inline-element-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editable-inline-element-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 RenderBR {BR} at (1,1) size 0x19 RenderText {#text} at (1,21) size 20x19 text run at (1,21) width 20: "foo" -caret: position 0 of child 1 {#text} of child 0 {SPAN} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 1 {#text} of child 0 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/edited-whitespace-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/edited-whitespace-1-expected.txt index 7802955..586ecfa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/edited-whitespace-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/edited-whitespace-1-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 text run at (1,1) width 52: " Hello " text run at (1,21) width 43: "World " RenderBlock {OL} at (0,114) size 784x0 -caret: position 17 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 17 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt index cbe8b4d..f67fa33 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt @@ -81,4 +81,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 7: "c" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (1,37) size 705x0 -caret: position 1 of child 0 {#text} of child 21 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 1 of child 0 {#text} of child 21 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/typing-tab-designmode-forms-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/typing-tab-designmode-forms-expected.txt index 945ec10..60245d9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/typing-tab-designmode-forms-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/typing-tab-designmode-forms-expected.txt @@ -18,4 +18,4 @@ layer at (10,11) size 151x16 text run at (1,0) width 32: "\x{9}" layer at (10,33) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 0 {DIV} of child 1 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4806874-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4806874-expected.txt index b4747109..6ee5ea7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4806874-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4806874-expected.txt @@ -15,4 +15,4 @@ layer at (0,0) size 800x600 text run at (187,1) width 3: ":" layer at (42,47) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 1 of child 1 {INPUT} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 1 {INPUT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4861080-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4861080-expected.txt index 3b2fced..6f037f6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4861080-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4861080-expected.txt @@ -24,5 +24,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,24) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock {UL} at (0,116) size 784x0 -selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 7 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 7 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-1-expected.txt index 2783a2e..16960597 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-1-expected.txt @@ -22,4 +22,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (1,1) size 30x18 RenderText at (4,1) size 7x16 text run at (4,1) width 7: "1" -caret: position 3 of child 1 {SELECT} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 of child 1 {SELECT} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-2-expected.txt index 7044e25..9a9f403 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4944770-2-expected.txt @@ -26,4 +26,4 @@ layer at (0,0) size 800x600 text run at (43,0) width 4: " " RenderText {#text} at (47,0) size 7x19 text run at (47,0) width 7: "x" -caret: position 1 of child 3 {#text} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 3 {#text} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4947130-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4947130-expected.txt index 6152942..d3b534d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4947130-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4947130-expected.txt @@ -17,5 +17,5 @@ layer at (0,0) size 800x600 RenderImage {IMG} at (42,0) size 76x103 RenderText {#text} at (118,88) size 28x19 text run at (118,88) width 28: "xxxx" -selection start: position 0 of child 1 {IMG} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 1 {IMG} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 1 {IMG} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 1 {IMG} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4989774-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4989774-expected.txt index d710a24..f262525 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4989774-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4989774-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 text run at (0,123) width 301: "pictures above all in the same line/paragraph." RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -caret: position 164 of child 4 {#text} of child 0 {BODY} of child 0 {HTML} of document +caret: position 164 of child 4 {#text} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt index 56c5b84..86a2df1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5027857-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 410: "<input type='button'>foo<br>bar<b>baz</b>" RenderBlock (anonymous) at (0,34) size 784x0 RenderInline {SPAN} at (0,0) size 0x0 -caret: position 41 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 2 {PRE} of child 0 {BODY} of child 0 {HTML} of document +caret: position 41 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 2 {PRE} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5032095-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5032095-expected.txt index 179ae54..693daaf 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5032095-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5032095-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 28: "hello" RenderText {#text} at (28,0) size 35x19 text run at (28,0) width 35: "world" -caret: position 5 of child 1 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 5 of child 1 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt index 8e92a5e..38035fe 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5065605-expected.txt @@ -30,4 +30,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,40) size 784x0 RenderInline {FONT} at (0,0) size 0x0 [color=#FF0000] RenderInline {SPAN} at (0,0) size 0x0 [color=#000000] -caret: position 24 of child 0 {#text} of child 0 {FONT} of child 1 {DIV} of child 0 {SPAN} of child 0 {FONT} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 24 of child 0 {#text} of child 0 {FONT} of child 1 {DIV} 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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-2-expected.txt index 49fca8a..224de96 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-2-expected.txt @@ -17,4 +17,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (149,0) size 127x19 text run at (149,0) width 127: "This should be a link." RenderBlock (anonymous) at (0,40) size 784x0 -caret: position 22 of child 0 {#text} of child 1 {A} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 22 of child 0 {#text} of child 1 {A} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-expected.txt index 5b722a9..8b418a4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5071074-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 RenderInline {A} at (0,0) size 127x19 [color=#0000EE] RenderText {#text} at (0,0) size 127x19 text run at (0,0) width 127: "This should be a link." -caret: position 22 of child 0 {#text} of child 0 {A} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 22 of child 0 {#text} of child 0 {A} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-2-expected.txt index 0b0bdf8..2119390 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-2-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 157x19 [color=#FF0000] RenderText {#text} at (0,0) size 157x19 text run at (0,0) width 157: "This should be underlined." -caret: position 26 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 26 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-3-expected.txt index a811bcc..259c3f7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-3-expected.txt @@ -16,4 +16,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (180,0) size 157x19 text run at (180,0) width 157: "This should be underlined." RenderBlock (anonymous) at (0,20) size 784x0 -caret: position 30 of child 0 {#text} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 30 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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-expected.txt index 56bf71a..00b0dcf 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5075944-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 157x19 RenderText {#text} at (0,0) size 157x19 text run at (0,0) width 157: "This should be underlined." -caret: position 26 of child 0 {#text} of child 0 {SPAN} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 26 of child 0 {#text} of child 0 {SPAN} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5134759-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5134759-expected.txt index 138544d..aad753b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5134759-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5134759-expected.txt @@ -21,4 +21,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (36,0) size 44x19 text run at (36,0) width 44: "World!" RenderBlock (anonymous) at (0,20) size 784x0 -caret: position 6 of child 0 {#text} of child 0 {DIV} of child 1 {SPAN} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 6 of child 0 {#text} of child 0 {DIV} of child 1 {SPAN} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt index 1b00bb6..d91557e 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt @@ -1,17 +1,17 @@ -layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 426x19
- text run at (0,0) width 426: "This tests for a crash when pasting content into a link inside a table cell."
- RenderBlock {DIV} at (0,36) size 784x30
- RenderTable {TABLE} at (0,0) size 137x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 135x28
- RenderTableRow {TR} at (0,2) size 135x24
- RenderTableCell {TD} at (2,2) size 131x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderInline {A} at (0,0) size 127x19 [color=#0000EE]
- RenderText {#text} at (2,2) size 127x19
- text run at (2,2) width 127: "This should be a link."
-caret: position 21 of child 0 {#text} of child 0 {A} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {P} at (0,0) size 784x20 + RenderText {#text} at (0,0) size 426x19 + text run at (0,0) width 426: "This tests for a crash when pasting content into a link inside a table cell." + RenderBlock {DIV} at (0,36) size 784x30 + RenderTable {TABLE} at (0,0) size 137x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 135x28 + RenderTableRow {TR} at (0,2) size 135x24 + RenderTableCell {TD} at (2,2) size 131x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderInline {A} at (0,0) size 127x19 [color=#0000EE] + RenderText {#text} at (2,2) size 127x19 + text run at (2,2) width 127: "This should be a link." +caret: position 21 of child 0 {#text} of child 0 {A} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5247341-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5247341-expected.txt index 056911a..738e390 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5247341-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5247341-expected.txt @@ -16,4 +16,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 80: "Hello World!" RenderBlock {DIV} at (0,40) size 784x20 RenderBR {BR} at (0,0) size 0x19 -caret: position 0 of child 0 {BR} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt index 36e7884..e2802b2 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt @@ -1,20 +1,20 @@ -layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 744x39
- text run at (0,0) width 356: "This tests for a crash when pasting content into a table cell. "
- text run at (356,0) width 388: "The table cell has some collapsed whitespace at the end of it that"
- text run at (0,20) width 106: "tickled the crash. "
- text run at (106,20) width 316: "You should see 'Hello World' in the table cell below."
- RenderBlock {DIV} at (0,56) size 784x30
- RenderTable {TABLE} at (0,0) size 85x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 83x28
- RenderTableRow {TR} at (0,2) size 83x24
- RenderTableCell {TD} at (2,2) size 79x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 75x19
- text run at (2,2) width 75: "Hello World"
- text run at (77,2) width 0: " \x{9}\x{9} \x{9}\x{9}"
-caret: position 11 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 744x39 + text run at (0,0) width 356: "This tests for a crash when pasting content into a table cell. " + text run at (356,0) width 388: "The table cell has some collapsed whitespace at the end of it that" + text run at (0,20) width 106: "tickled the crash. " + text run at (106,20) width 316: "You should see 'Hello World' in the table cell below." + RenderBlock {DIV} at (0,56) size 784x30 + RenderTable {TABLE} at (0,0) size 85x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 83x28 + RenderTableRow {TR} at (0,2) size 83x24 + RenderTableCell {TD} at (2,2) size 79x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 75x19 + text run at (2,2) width 75: "Hello World" + text run at (77,2) width 0: " \x{9}\x{9} \x{9}\x{9}" +caret: position 11 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5478250-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5478250-expected.txt index c6cb82c..1257c90 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5478250-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5478250-expected.txt @@ -20,4 +20,4 @@ layer at (0,0) size 800x600 RenderInline {B} at (0,0) size 385x19 RenderText {#text} at (0,0) size 385x19 text run at (0,0) width 385: "This text should bold and left justified with \"Some text...\"." -caret: position 61 of child 0 {#text} of child 0 {B} of child 2 {DIV} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 61 of child 0 {#text} of child 0 {B} of child 2 {DIV} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5483567-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5483567-expected.txt index 381578f..cb23767 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5483567-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5483567-expected.txt @@ -10,4 +10,4 @@ layer at (0,0) size 800x600 text run at (7,0) width 20: "foo" RenderText {#text} at (27,0) size 7x19 text run at (27,0) width 7: "x" -caret: position 3 of child 1 {#text} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 of child 1 {#text} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5601583-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5601583-1-expected.txt index c3330e0..34c172c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5601583-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5601583-1-expected.txt @@ -22,4 +22,4 @@ layer at (0,0) size 800x600 RenderBR {BR} at (32,15) size 0x0 RenderText {#text} at (0,20) size 39x19 text run at (0,20) width 39: "World" -caret: position 5 of child 2 {#text} of child 0 {A} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 5 of child 2 {#text} of child 0 {A} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/copy-paste-bidi-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/copy-paste-bidi-expected.txt index 0587da7..386ea7e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/copy-paste-bidi-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/copy-paste-bidi-expected.txt @@ -22,4 +22,4 @@ layer at (0,0) size 800x600 text run at (720,0) width 32 RTL: "\x{5E9}\x{5D3}\x{5D2}\x{5DB}:" text run at (752,0) width 32: "1234" RenderBlock (anonymous) at (0,40) size 784x0 -caret: position 9 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 9 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/input-field-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/input-field-1-expected.txt index c02fc67..36c6595 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/input-field-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/input-field-1-expected.txt @@ -28,4 +28,4 @@ layer at (10,47) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 layer at (165,47) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 1 of child 1 {INPUT} of child 2 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 1 of child 1 {INPUT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-1-expected.txt index c813159..43bf41c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-1-expected.txt @@ -35,4 +35,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (3,27) size 774x22 [border: (1px solid #000000)] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "bar" -caret: position 3 of child 0 {#text} of child 1 {DIV} of child 4 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 3 of child 0 {#text} of child 1 {DIV} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-2-expected.txt index f2bfe40..111d469 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-2-expected.txt @@ -36,4 +36,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (3,27) size 774x22 [border: (1px solid #000000)] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "bar" -caret: position 3 of child 0 {#text} of child 1 {DIV} of child 4 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 3 of child 0 {#text} of child 1 {DIV} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-expected.txt index 868c041..9a305ae 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-after-delete-expected.txt @@ -22,4 +22,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (1,31) size 774x0 RenderBlock {DIV} at (5,31) size 766x22 [border: (1px solid #0000FF)] RenderBR {BR} at (1,1) size 0x19 -caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-start-blockquote-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-start-blockquote-expected.txt index 60b440d..eb45a90e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-start-blockquote-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/merge-start-blockquote-expected.txt @@ -20,4 +20,4 @@ layer at (0,0) size 800x600 RenderBlock {BLOCKQUOTE} at (40,0) size 704x22 [border: (1px solid #0000FF)] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "bar" -caret: position 3 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 4 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 3 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-unrendered-select-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-unrendered-select-expected.txt index f4e3305..2d5db2d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-unrendered-select-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-unrendered-select-expected.txt @@ -19,4 +19,4 @@ layer at (0,0) size 800x600 text run at (32,0) width 4: " " RenderText {#text} at (36,0) size 39x19 text run at (36,0) width 39: "World" -caret: position 5 of child 2 {#text} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 5 of child 2 {#text} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/prevent-block-nesting-01-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/prevent-block-nesting-01-expected.txt index 2eab679..dc549e3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/prevent-block-nesting-01-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/prevent-block-nesting-01-expected.txt @@ -27,4 +27,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (1,1) size 512x19 text run at (1,1) width 512: "This paragraph and the empty line should have be in their own divs with a red border." RenderBlock (anonymous) at (1,71) size 778x0 -caret: position 85 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 85 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt index 058ada8..8d21160 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt @@ -54,4 +54,4 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderText {#text} at (0,0) size 43x19 text run at (0,0) width 43: "Passed" -caret: position 35 of child 0 {SELECT} of child 4 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 35 of child 0 {SELECT} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/13804-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/13804-expected.txt index a5e12bb..de2d162 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/13804-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/13804-expected.txt @@ -10,4 +10,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,56) size 784x20 RenderText {#text} at (0,0) size 284x19 text run at (0,0) width 284: "This sentence ends with a misspelled word asd." -caret: position 40 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 40 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/14971-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/14971-expected.txt index c3c21bc..2f2cab6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/14971-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/14971-expected.txt @@ -17,5 +17,5 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 39x19 RenderText {#text} at (36,0) size 39x19 text run at (36,0) width 39: "World" -selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {#text} of child 2 {SPAN} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {#text} of child 2 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4397952-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4397952-expected.txt index 4ef262d..38bc33c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4397952-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4397952-expected.txt @@ -22,4 +22,4 @@ layer at (0,0) size 800x600 RenderText at (3,1) size 20x16 text run at (3,1) width 20: "Bar" RenderText {#text} at (0,0) size 0x0 -caret: position 1 of child 2 {INPUT} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 2 {INPUT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4818145-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4818145-expected.txt index 3e37fa1..b6e0234 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4818145-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4818145-expected.txt @@ -14,5 +14,5 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (2,2) size 24x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 20x19 text run at (2,2) width 20: "foo" -selection start: position 0 of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4866671-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4866671-expected.txt index 271d8a1..c45cbe8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4866671-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4866671-expected.txt @@ -20,4 +20,4 @@ layer at (0,0) size 800x600 text run at (7,0) width 24: "yyy" RenderText {#text} at (31,0) size 7x19 text run at (31,0) width 7: "x" -caret: position 0 of child 2 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 2 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4889598-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4889598-expected.txt index 77fdcc0..34e0a97 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4889598-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4889598-expected.txt @@ -62,4 +62,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,50) size 784x20 RenderText {#text} at (0,0) size 242x19 text run at (0,0) width 242: "Click anywhere in this line and move up." -caret: position 6 of child 0 {#text} of child 1 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 3 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 6 of child 0 {#text} of child 1 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 3 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-1-expected.txt index a08b379..0dd3844 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-1-expected.txt @@ -18,5 +18,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (2,2) size 20x19 text run at (2,2) width 20: "foo" RenderBlock (anonymous) at (1,31) size 782x0 -selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 3 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 3 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-2-expected.txt index 3dd8c7d..022b7a1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-2-expected.txt @@ -25,4 +25,4 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderText {#text} at (0,0) size 49x19 text run at (0,0) width 49: "Success" -caret: position 4 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 4 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-3-expected.txt index b4e7464..fe7c6eb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-3-expected.txt @@ -23,4 +23,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 21: "baz" layer at (10,107) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 0 of child 0 {DIV} of child 1 {INPUT} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {DIV} of child 1 {INPUT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-4-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-4-expected.txt index 9a065c7..ebad6d4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-4-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4895428-4-expected.txt @@ -20,5 +20,5 @@ layer at (0,0) size 800x600 text run at (2,2) width 47: "editable" RenderBlock (anonymous) at (1,31) size 782x0 RenderBlock {UL} at (0,126) size 784x0 -selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 8 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 8 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-1-expected.txt index 829ea2f..a5698ba 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-1-expected.txt @@ -17,4 +17,4 @@ layer at (0,0) size 800x600 RenderImage {IMG} at (123,0) size 76x103 RenderText {#text} at (199,88) size 193x19 text run at (199,88) width 193: "at the beginning of this sentence." -caret: position 0 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-2-expected.txt index 78337d9..bb6e2fa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-2-expected.txt @@ -17,4 +17,4 @@ layer at (0,0) size 800x600 RenderImage {IMG} at (23,0) size 76x103 RenderText {#text} at (99,88) size 351x19 text run at (99,88) width 351: "caret should be just after the second word in this sentence." -caret: position 5 of child 2 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 5 of child 2 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-3-expected.txt index 620798c..a16d107 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4932260-3-expected.txt @@ -17,4 +17,4 @@ layer at (0,0) size 800x600 RenderImage {IMG} at (370,0) size 76x103 RenderText {#text} at (446,88) size 56x19 text run at (446,88) width 56: "sentence." -caret: position 59 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 59 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4947387-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4947387-expected.txt index 7111c3f..a6fa8eb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4947387-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4947387-expected.txt @@ -31,5 +31,5 @@ layer at (0,0) size 800x600 text run at (0,0) width 175: "The quick brown fox jumped" text run at (175,0) width 4: " " text run at (0,20) width 150: "over the lazy brown dog." -selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 51 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 51 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4960116-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4960116-expected.txt index cc52f9b..35d0970 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4960116-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4960116-expected.txt @@ -10,4 +10,4 @@ layer at (0,0) size 800x600 text run at (282,20) width 497: "For example, set the caret inside of an editable div, and make the div invisible, then" text run at (0,40) width 363: "try to move the selection forward/backward by a paragraph." RenderBlock {DIV} at (0,76) size 784x20 -caret: position 0 of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4975120-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4975120-expected.txt index 3bce50c..d967563 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4975120-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4975120-expected.txt @@ -23,5 +23,5 @@ layer at (10,67) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 17x16 text run at (1,0) width 17: "foo" -selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 3 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 3 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4983858-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4983858-expected.txt index e42b0d9..b927369 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4983858-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/4983858-expected.txt @@ -12,5 +12,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 784x20 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "foo" -selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 3 of child 0 {#text} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 3 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-2-expected.txt index 51a3f7a..ca0de99 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-2-expected.txt @@ -21,4 +21,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,60) size 21x19 text run at (0,60) width 21: "xxx" RenderBR {BR} at (21,75) size 0x0 -caret: position 3 of child 6 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 of child 6 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-expected.txt index fc821b6..7e39775 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5007143-expected.txt @@ -21,4 +21,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,60) size 21x19 text run at (0,60) width 21: "xxx" RenderBR {BR} at (21,75) size 0x0 -caret: position 2 of child 6 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 2 of child 6 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-2-expected.txt index 5971685..f61cc4f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-2-expected.txt @@ -26,5 +26,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,30) size 784x20 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "bar" -selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 0 of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 0 of child 3 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt index a92aca9..69a43e8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt @@ -26,5 +26,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,30) size 784x20 RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "bar" -selection start: position 3 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 0 of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 3 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 0 of child 3 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-1-expected.txt index ee2b1d6..dfeed31 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-1-expected.txt @@ -20,4 +20,4 @@ layer at (0,0) size 800x600 RenderBlock {P} at (0,120) size 784x20 RenderText {#text} at (0,0) size 541x19 text run at (0,0) width 541: "In the above editable region, you should see 'foo' in the bordered table and 'bar' outside it." -caret: position 3 of child 1 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 of child 1 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-2-expected.txt index fda8372..fb49b71 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-2-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (2,2) size 22x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "foo" -caret: position 0 of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-3-expected.txt index 6df60ce..73f95f7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5076323-3-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (2,2) size 22x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "foo" -caret: position 1 of child 0 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 0 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-1-expected.txt index 488ecc8..91407c1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-1-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 text run at (169,20) width 608: "The expected behavior is to create a selection at [body, 0]. There should be a caret at the start of this" text run at (777,20) width 4: " " text run at (0,40) width 65: "paragraph." -caret: position 0 of child 0 {#text} of child 1 {P} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-2-expected.txt index 92387e5..cfd4faa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5081257-2-expected.txt @@ -7,4 +7,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 769x19 text run at (0,0) width 487: "This tests for setting the selection at a position inside a document in designMode. " text run at (487,0) width 282: "You should see a caret at the start of the body." -caret: position 0 of child 0 {#text} of child 1 {P} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5099303-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5099303-expected.txt index 593bc01..e2a0f4e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5099303-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5099303-expected.txt @@ -15,5 +15,5 @@ layer at (0,0) size 800x600 text run at (7,0) width 14: "xx" RenderText {#text} at (21,0) size 7x19 text run at (21,0) width 7: "x" -selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 2 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 2 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt index 7ec09c0..9983d8c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 text run at (27,0) width 43: "second" RenderText {#text} at (70,0) size 249x19 text run at (70,0) width 249: " word in this sentence should be selected." -caret: position 3 of child 0 {#text} of child 1 {SPAN} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 3 of child 0 {#text} of child 1 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt index 1664543..c5fcaa4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt @@ -26,5 +26,5 @@ layer at (10,201) size 211x16 RenderBlock {DIV} at (2,3) size 211x16 RenderText {#text} at (1,0) size 190x16 text run at (1,0) width 190: "This text field should be focused." -selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 34 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 34 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-1-expected.txt index 29c6ac6..cfd04df 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-1-expected.txt @@ -14,5 +14,5 @@ layer at (0,0) size 800x600 RenderListMarker at (-18,0) size 7x19: bullet RenderText {#text} at (0,0) size 49x19 text run at (0,0) width 49: "Success" -selection start: position 3 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 9 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 3 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 9 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-2-expected.txt index 08f1bed..4d083d8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5195166-2-expected.txt @@ -21,5 +21,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 339x19 text run at (0,0) width 339: "There should be five characters selected in this sentence." RenderBlock {UL} at (0,72) size 784x0 -selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 2 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 2 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-1-expected.txt index 1b1d92f..cf71e93 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-1-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 775: "malesuada fames ac turpis egestas. Mauris ut pede. Integer lacus. Ut ipsum. Phasellus tristique leo eu velit. Vestibulum arcu lacus," text run at (775,20) width 4: " " text run at (0,40) width 485: "blandit ac, condimentum sed, commodo in, arcu. Curabitur suscipit pede eu sem." -caret: position 72 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 72 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-2-expected.txt index 7a1c590..923b6af 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5234383-2-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 775: "malesuada fames ac turpis egestas. Mauris ut pede. Integer lacus. Ut ipsum. Phasellus tristique leo eu velit. Vestibulum arcu lacus," text run at (775,20) width 4: " " text run at (0,40) width 485: "blandit ac, condimentum sed, commodo in, arcu. Curabitur suscipit pede eu sem." -caret: position 241 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 241 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5240265-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5240265-expected.txt index 368a408..6f9921b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5240265-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5240265-expected.txt @@ -18,5 +18,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,98) size 784x20 RenderText {#text} at (0,0) size 170x19 text run at (0,0) width 170: "This text should be selected." -selection start: position 0 of child 0 {#text} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 29 of child 0 {#text} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 29 of child 0 {#text} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5333725-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5333725-expected.txt index e0f18dc..a703b31 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5333725-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5333725-expected.txt @@ -12,5 +12,5 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 32x19 RenderText {#text} at (48,0) size 32x19 text run at (48,0) width 32: "6789" -selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 2 of child 1 {#text} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 2 of child 1 {#text} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-1-expected.txt index 685f4b0..7cf06b5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-1-expected.txt @@ -15,4 +15,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 246: "The paragraph break should be selected." RenderBlock (anonymous) at (0,20) size 784x20 RenderBR {BR} at (0,0) size 0x19 -caret: position 39 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 39 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/addRange-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/addRange-expected.txt index 8ab89ec..3a5fbd9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/addRange-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/addRange-expected.txt @@ -11,5 +11,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,56) size 784x20 RenderText {#text} at (0,0) size 72x19 text run at (0,0) width 72: "123456789" -selection start: position 2 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 6 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 2 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 6 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/caret-before-select-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/caret-before-select-expected.txt index 593bd40..f915736 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/caret-before-select-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/caret-before-select-expected.txt @@ -10,4 +10,4 @@ layer at (0,0) size 800x600 text run at (4,1) width 24: "One" RenderText {#text} at (86,37) size 25x19 text run at (86,37) width 25: "blaa" -caret: position 0 of child 0 {SELECT} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {SELECT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/contains-boundaries-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/contains-boundaries-expected.txt index ed8e074..d6de159 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/contains-boundaries-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/contains-boundaries-expected.txt @@ -25,5 +25,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,176) size 784x84 [bgcolor=#FFFFCC] RenderText {#text} at (0,1) size 68x81 text run at (0,1) width 68: "W" -selection start: position 0 of child 0 {#text} of child 6 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {#text} of child 6 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 6 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {#text} of child 6 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-select-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-select-1-expected.txt index c4b0b6d..64340d9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-select-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-select-1-expected.txt @@ -17,5 +17,5 @@ layer at (0,0) size 800x600 RenderBlock {UL} at (0,74) size 784x0 layer at (77,47) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -selection start: position 5 of child 0 {#text} of child 0 {SPAN} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 1 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 5 of child 0 {#text} of child 0 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 1 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/editable-html-element-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/editable-html-element-expected.txt index b580799..fd9438f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/editable-html-element-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/editable-html-element-expected.txt @@ -1,4 +1,4 @@ -EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of HTML > #document to 3 of HTML > #document +EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of HTML > #document to 2 of HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification @@ -27,4 +27,4 @@ layer at (0,0) size 800x600 text run at (498,20) width 283: "This test also does some editing to make sure it" text run at (781,20) width 3: " " text run at (0,40) width 125: "happens in the body." -caret: position 153 of child 3 {#text} of child 2 {BODY} of child 0 {HTML} of document +caret: position 153 of child 3 {#text} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inline-closest-leaf-child-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inline-closest-leaf-child-expected.txt index 7f5f4e8..43edffe 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inline-closest-leaf-child-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inline-closest-leaf-child-expected.txt @@ -32,5 +32,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (44,30) size 35x19 text run at (44,30) width 35: "ipsum" RenderText {#text} at (0,0) size 0x0 -selection start: position 2 of child 0 {#text} of child 1 {SPAN} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 4 of child 2 {#text} of child 1 {SPAN} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 2 of child 0 {#text} of child 1 {SPAN} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 4 of child 2 {#text} of child 1 {SPAN} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-6-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-6-expected.txt index b802899..caeb45f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-6-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-6-expected.txt @@ -24,5 +24,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 784x20 RenderText {#text} at (0,0) size 29x19 text run at (0,0) width 29: "Four" -selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 4 of child 0 {#text} of child 5 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 4 of child 0 {#text} of child 5 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-7-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-7-expected.txt index e2dad40..0798c3f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-7-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/mixed-editability-7-expected.txt @@ -24,5 +24,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 784x20 RenderText {#text} at (0,0) size 29x19 text run at (0,0) width 29: "Four" -selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 5 of child 0 {#text} of child 2 {SPAN} of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 5 of child 0 {#text} of child 2 {SPAN} of child 3 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/move-by-sentence-linebreak-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/move-by-sentence-linebreak-expected.txt index 652edb5..d27c376 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/move-by-sentence-linebreak-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/move-by-sentence-linebreak-expected.txt @@ -27,4 +27,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 82: "This is a test. " text run at (82,0) width 90: "How are you? " text run at (172,0) width 80: "Life is sweet!" -caret: position 30 of child 0 {#text} of child 9 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 30 of child 0 {#text} of child 9 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-005-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-005-expected.txt index 117f5c6..49b89ce 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-005-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-005-expected.txt @@ -12,5 +12,6 @@ layer at (0,0) size 800x600 text run at (776,0) width 4: " " text run at (0,20) width 191: "on this page should be selected." RenderText {#text} at (0,0) size 0x0 -selection start: position 0 of child 0 {#text} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 164 of child 0 {#text} of child 0 {BODY} of child 0 {HTML} of document + RenderText {#text} at (0,0) size 0x0 +selection start: position 0 of child 0 {#text} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 164 of child 0 {#text} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-1-expected.txt index 5377b28..e542056 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-1-expected.txt @@ -30,4 +30,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,102) size 784x20 RenderText {#text} at (0,0) size 21x19 text run at (0,0) width 21: "baz" -caret: position 0 of child 1 {TABLE} of child 2 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-2-expected.txt index 6045e07..de96f25 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-2-expected.txt @@ -30,4 +30,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,102) size 784x20 RenderText {#text} at (0,0) size 21x19 text run at (0,0) width 21: "baz" -caret: position 1 of child 1 {TABLE} of child 2 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 1 of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-3-expected.txt index e5eb56a..039ef1e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/table-caret-3-expected.txt @@ -28,4 +28,4 @@ layer at (0,0) size 800x600 text run at (2,2) width 40: "a table" RenderText {#text} at (70,67) size 21x19 text run at (70,67) width 21: "baz" -caret: position 1 of child 1 {TABLE} of child 2 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 1 of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.txt index 68b28d17..2f1ab8d 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 text run at (1,1) width 11: "a "
RenderText {#text} at (12,1) size 301x19
text run at (12,1) width 301: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-caret: position 2 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+caret: position 2 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.txt index a17594b..0d05ce8 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 301x19 [color=#0000FF]
RenderText {#text} at (12,1) size 301x19
text run at (12,1) width 301: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-caret: position 2 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+caret: position 2 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/4916887-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/4916887-expected.txt index 48d96ce..801b8e4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/4916887-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/4916887-expected.txt @@ -12,5 +12,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 146x19 text run at (0,0) width 146: "This text should be blue." RenderBlock (anonymous) at (0,20) size 784x0 -selection start: position 0 of child 0 {#text} of child 0 {FONT} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 25 of child 0 {#text} of child 0 {FONT} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {FONT} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 25 of child 0 {#text} of child 0 {FONT} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-1-expected.txt index 77092ad..6789f54 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-1-expected.txt @@ -22,5 +22,5 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (83,2) size 95x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (2,2) size 91x19 text run at (2,2) width 91: "plaintext-only" -selection start: position 0 of child 0 {#text} of child 0 {B} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {B} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-2-expected.txt index 9b20de5..3a48c04 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5017613-2-expected.txt @@ -29,5 +29,5 @@ layer at (0,0) size 800x600 text run at (2,2) width 50: "plaintext" RenderText {#text} at (52,2) size 31x19 text run at (52,2) width 31: "-only" -selection start: position 0 of child 0 {#text} of child 0 {B} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 9 of child 0 {#text} of child 0 {SPAN} of child 1 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {B} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 9 of child 0 {#text} of child 0 {SPAN} of child 1 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-1-expected.txt index d384430..79a27a5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-1-expected.txt @@ -19,5 +19,5 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,20) size 784x20 RenderText {#text} at (0,0) size 21x19 text run at (0,0) width 21: "baz" -selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 3 of child 0 {#text} of child 0 {DIV} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 3 of child 0 {#text} of child 0 {DIV} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-2-expected.txt index 47eae51d..bf094b6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5046875-2-expected.txt @@ -20,5 +20,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 784x20 RenderText {#text} at (381,0) size 21x19 text run at (381,0) width 21: "baz" -selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 3 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 3 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5065910-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5065910-expected.txt index f8268e4..174e4f0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5065910-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5065910-expected.txt @@ -21,4 +21,4 @@ layer at (0,0) size 800x600 RenderInline {FONT} at (0,0) size 24x19 [color=#0000FF] RenderText {#text} at (340,0) size 24x19 text run at (340,0) width 24: "red." -caret: position 37 of child 0 {#text} of child 1 {FONT} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 37 of child 0 {#text} of child 1 {FONT} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5084241-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5084241-expected.txt index 8b063da..22d1ae1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5084241-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5084241-expected.txt @@ -13,4 +13,4 @@ layer at (0,0) size 800x600 RenderInline {FONT} at (0,0) size 146x19 [color=#0000FF] RenderText {#text} at (141,0) size 146x19 text run at (141,0) width 146: "This text should be blue." -caret: position 25 of child 0 {#text} of child 1 {FONT} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 25 of child 0 {#text} of child 1 {FONT} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5228141-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5228141-expected.txt index d65fd37..7e02a75 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5228141-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5228141-expected.txt @@ -16,5 +16,5 @@ layer at (0,0) size 800x600 text run at (0,88) width 162: "This text should be bold." RenderInline {B} at (0,0) size 76x19 RenderImage {IMG} at (162,0) size 76x103 -selection start: position 0 of child 0 {BR} of child 0 {B} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 1 of child 0 {IMG} of child 1 {B} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {BR} of child 0 {B} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 0 {IMG} of child 1 {B} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5279521-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5279521-expected.txt index e4bc583..8793ae0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5279521-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/5279521-expected.txt @@ -10,5 +10,5 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,103) size 784x20 RenderText {#text} at (65,0) size 719x19 text run at (65,0) width 719: "This tests for a crash when changing the alignment of content that starts with an image not inside its own block container." -selection start: position 0 of child 0 {IMG} of child 0 {DIV} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 123 of child 0 {#text} of child 1 {DIV} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {IMG} of child 0 {DIV} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 123 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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt index 57d9a2a..f0f1ff5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt @@ -12,4 +12,4 @@ layer at (0,0) size 800x600 text run at (234,0) width 234: "This text should be Times New Roman bold." RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -caret: position 41 of child 0 {#text} of child 0 {SPAN} of child 1 {SPAN} of child 0 {SPAN} of child 0 {BODY} of child 0 {HTML} of document +caret: position 41 of child 0 {#text} of child 0 {SPAN} of child 1 {SPAN} of child 0 {SPAN} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/fontsize-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/fontsize-1-expected.txt index 3859e9d..8c91da6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/fontsize-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/fontsize-1-expected.txt @@ -18,4 +18,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (85,0) size 63x36 text run at (85,0) width 63: "large" RenderBlock {UL} at (0,89) size 784x0 -caret: position 5 of child 0 {#text} of child 2 {SPAN} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 5 of child 0 {#text} of child 2 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/highlight-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/highlight-expected.txt index 4981bba..1d2fe50 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/highlight-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/highlight-expected.txt @@ -6,4 +6,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x20 RenderText {#text} at (0,0) size 125x19 text run at (0,0) width 125: "some highlighted text" -caret: position 0 of child 0 {#text} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {#text} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/non-inheritable-styles-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/non-inheritable-styles-expected.txt index 9126970..332333c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/non-inheritable-styles-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/non-inheritable-styles-expected.txt @@ -41,4 +41,4 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,42) size 784x20 RenderText {#text} at (0,0) size 174x19 text run at (0,0) width 174: "This shouldn't have a border." -caret: position 29 of child 2 {#text} of child 5 {SPAN} of child 2 {BODY} of child 0 {HTML} of document +caret: position 29 of child 2 {#text} of child 5 {SPAN} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/5378473-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/5378473-expected.txt index 00a6273..9788c65d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/5378473-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/5378473-expected.txt @@ -4,4 +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 784x20 -caret: position 0 of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/relative-painted-twice-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/relative-painted-twice-expected.txt new file mode 100644 index 0000000..16e2172 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/relative-painted-twice-expected.txt @@ -0,0 +1,11 @@ +layer at (0,0) size 785x2016 + RenderView at (0,0) size 785x600 +layer at (0,0) size 785x2016 + RenderBlock {HTML} at (0,0) size 785x2016 + RenderBody {BODY} at (8,8) size 769x2000 + RenderBlock {DIV} at (0,0) size 769x150 + RenderBlock {DIV} at (0,150) size 769x0 +layer at (8,58) size 769x100 + RenderBlock (relative positioned) {DIV} at (0,0) size 769x0 + RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#0000007F] +caret: position 0 of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/delete-contents-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/delete-contents-expected.txt new file mode 100644 index 0000000..77baa92 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/delete-contents-expected.txt @@ -0,0 +1,9 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +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 784x0 + RenderBlock {DIV} at (0,0) size 784x0 +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 1 {BODY} of child 1 {HTML} of document +selection end: position 5 of child 0 {#text} of child 0 {DIV} of child 1 {BODY} of child 1 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.checksum new file mode 100644 index 0000000..20a991e --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.checksum @@ -0,0 +1 @@ +97d4c2fda8a6820ed9d8579c2f116de8
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.png Binary files differnew file mode 100644 index 0000000..81856c4 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.txt new file mode 100644 index 0000000..a1b0363 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/context-no-deselect-expected.txt @@ -0,0 +1,16 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 +layer at (10,11) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 104x16 + text run at (1,0) width 104: "some sample text" +selection start: position 5 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 15 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/label-focus-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/label-focus-expected.txt index 1bb3670..c464a06 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/label-focus-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/label-focus-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 text run at (0,0) width 171: "THIS TEST HAS PASSED" layer at (51,11) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 0 of child 0 {DIV} of child 1 {INPUT} of child 1 {LABEL} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {DIV} of child 1 {INPUT} of child 1 {LABEL} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-focus-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-focus-expected.txt index df3b016..cf1288b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-focus-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-focus-expected.txt @@ -31,5 +31,5 @@ layer at (169,47) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 90x16 text run at (1,0) width 90: "My Text Field 2" -selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 1 {P} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 15 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 1 {P} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 15 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-inside-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-inside-expected.txt index 61a5580..2cb9fe0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-inside-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-inside-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 73: "a focus ring." layer at (35,36) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 0 of child 0 {DIV} of child 0 {INPUT} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {DIV} of child 0 {INPUT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-outside-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-outside-expected.txt index 54150cf..da3dc4c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-outside-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-click-outside-expected.txt @@ -11,4 +11,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 128: "not have a focus ring." layer at (35,36) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 1 of child 0 {INPUT} of child 0 {DIV} of child 0 {BODY} of child 0 {HTML} of document +caret: position 1 of child 0 {INPUT} of child 0 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-double-click-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-double-click-expected.txt index ea3af11..c3ac2d4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-double-click-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-double-click-expected.txt @@ -13,5 +13,5 @@ layer at (10,11) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 74x16 text run at (1,0) width 74: "word another" -selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-drag-down-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-drag-down-expected.txt index 4cba9c3..d4e6356 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-drag-down-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-drag-down-expected.txt @@ -13,5 +13,5 @@ layer at (10,11) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 132x16 text run at (1,0) width 132: "This is a bunch of text." -selection start: position 7 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 24 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 7 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 24 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-option-delete-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-option-delete-expected.txt index 00ee3af..9ea310c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-option-delete-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-option-delete-expected.txt @@ -13,4 +13,4 @@ layer at (10,11) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 31x16 text run at (1,0) width 31: "word " -caret: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +caret: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-scroll-left-on-blur-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-scroll-left-on-blur-expected.txt index 40a2cde..b35f4e6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-scroll-left-on-blur-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-scroll-left-on-blur-expected.txt @@ -28,4 +28,4 @@ layer at (328,11) size 151x16 scrollX 187 scrollWidth 339 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 337x16 text run at (1,0) width 337: "this text field has a lot of text in it so that it needs to scroll" -caret: position 66 of child 0 {#text} of child 0 {DIV} of child 4 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +caret: position 66 of child 0 {#text} of child 0 {DIV} of child 4 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-self-emptying-click-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-self-emptying-click-expected.txt index 329024f..dfa6231 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-self-emptying-click-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-text-self-emptying-click-expected.txt @@ -12,4 +12,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 55: "text field." layer at (10,11) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 -caret: position 0 of child 0 {DIV} of child 0 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {DIV} of child 0 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-drag-into-disabled-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-drag-into-disabled-expected.txt index 4d9c9b0..7ab3012 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-drag-into-disabled-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-drag-into-disabled-expected.txt @@ -30,5 +30,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 layer at (2,69) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 [color=#545454] -selection start: position 0 of child 0 {#text} of child 7 {SPAN} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 9 of child 0 {#text} of child 7 {SPAN} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 7 {SPAN} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 9 of child 0 {#text} of child 7 {SPAN} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-overflow-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-overflow-expected.txt index a397250..cced8b3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-overflow-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textfield-overflow-expected.txt @@ -8,4 +8,4 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 layer at (10,11) size 151x4 RenderBlock {DIV} at (2,3) size 151x4 -caret: position 0 of child 0 {DIV} of child 1 {INPUT} of child 0 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-2-expected.txt index ae70065..1a8fe3f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-2-expected.txt @@ -10,4 +10,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 50x20
RenderText {#text} at (0,0) size 250x19
text run at (0,0) width 250: "The caret should be at the end of this line."
-caret: position 44 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+caret: position 44 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-expected.txt index ae70065..1a8fe3f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/25277-expected.txt @@ -10,4 +10,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,40) size 50x20
RenderText {#text} at (0,0) size 250x19
text run at (0,0) width 250: "The caret should be at the end of this line."
-caret: position 44 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+caret: position 44 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt index 149e204..f5136aa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt @@ -21,5 +21,5 @@ layer at (0,0) size 800x600 text run at (776,40) width 4: " " text run at (0,60) width 309: "drags a bit of text over the list marker and drops it. " text run at (309,60) width 367: "It should be pasted into the list item, which is contenteditable." -selection start: position 0 of child 0 {#text} of child 0 {LI} of child 1 {UL} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 6 of child 0 {#text} of child 0 {LI} of child 1 {UL} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 0 {LI} of child 1 {UL} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 6 of child 0 {#text} of child 0 {LI} of child 1 {UL} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png Binary files differindex e908359d..b609a53 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.txt index 4b627a3..d544847 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.txt @@ -45,5 +45,5 @@ layer at (8,28) size 500x400 scrollWidth 501 scrollHeight 719 text run at (0,660) width 500: "............................................................................................................................." text run at (0,680) width 500: "............................................................................................................................." text run at (0,700) width 212: "....................................................." -selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 0 {BODY} of child 0 {HTML} of document -selection end: position 4428 of child 0 {#text} of child 1 {DIV} of child 0 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 4428 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/4776765-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/4776765-expected.txt index a0106b4..0a9a13f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/4776765-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/4776765-expected.txt @@ -14,4 +14,4 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBlock {DIV} at (0,40) size 784x20 RenderBR {BR} at (0,0) size 0x19 -caret: position 0 of child 0 {BR} of child 4 {DIV} of child 3 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 4 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-delete-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-delete-expected.txt index c80d2c9..1752158 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-delete-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-delete-expected.txt @@ -12,4 +12,4 @@ layer at (0,0) size 800x600 text run at (0,20) width 106: "inside the red div." RenderBlock {DIV} at (30,70) size 152x22 [border: (1px solid #FF0000)] RenderBR {BR} at (1,1) size 0x19 -caret: position 0 of child 0 {BR} of child 3 {DIV} of child 2 {BODY} of child 0 {HTML} of document +caret: position 0 of child 0 {BR} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-remove-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-remove-expected.txt index 271a6f8..3edb656 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-remove-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-after-remove-expected.txt @@ -15,5 +15,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (33,1) size 35x19 text run at (33,1) width 35: "world" RenderBR {BR} at (68,16) size 0x0 -selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 2 {BODY} of child 0 {HTML} of document -selection end: position 6 of child 1 {#text} of child 3 {DIV} of child 2 {BODY} of child 0 {HTML} of document +selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 6 of child 1 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document |