summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-10 01:09:36 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-10 01:09:36 +0000
commit0a93894b92023e9ef211f106aa1080ad96fc12ca (patch)
treebcacde7bd83cfcbe390d70f009517f06da4137fe /webkit
parentd647d2d2b24fa9df1d6eaa461300ad5e95e8b3d1 (diff)
downloadchromium_src-0a93894b92023e9ef211f106aa1080ad96fc12ca.zip
chromium_src-0a93894b92023e9ef211f106aa1080ad96fc12ca.tar.gz
chromium_src-0a93894b92023e9ef211f106aa1080ad96fc12ca.tar.bz2
Rebaseline layout tests for windows
TBR=dglazkov Review URL: http://codereview.chromium.org/271041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt6
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt14
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt10
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt4
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.pngbin5493 -> 5507 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt47
7 files changed, 40 insertions, 43 deletions
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 0190d86..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
@@ -3,7 +3,7 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document to 35 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document to 34 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -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 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 35 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {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/4916541-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt
index 489acef..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
@@ -10,13 +10,11 @@ layer at (0,0) size 800x600
text run at (0,20) width 279: "and 'bar' before and after the indent operation."
RenderBlock {DIV} at (0,56) size 784x40
RenderBlock {BLOCKQUOTE} at (40,0) size 744x40
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "foo"
+ RenderText {#text} at (0,0) size 20x19
+ text run at (0,0) width 20: "foo"
RenderBR {BR} at (20,15) size 0x0
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (0,20) size 20x19
- text run at (0,20) width 20: "bar"
+ 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 {SPAN} of child 0 {BLOCKQUOTE} 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 {SPAN} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {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/5138441-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt
index abf571d..0e62a3d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt
@@ -10,12 +10,10 @@ layer at (0,0) size 800x600
text run at (0,20) width 725: "implement a \"Quote Text\" feature, and style rules for blockquotes appeared on the blockquotes that we use to implement"
text run at (0,40) width 57: "indenting."
RenderBlock {DIV} at (0,76) size 784x66
- RenderBlock {DIV} at (0,0) size 784x20
- RenderBlock {BLOCKQUOTE} at (40,0) size 744x20
- RenderText {#text} at (0,0) size 219x19
- text run at (0,0) width 219: "This should be indented, not quoted."
- RenderBlock (anonymous) at (0,20) size 784x0
+ RenderBlock {BLOCKQUOTE} at (40,0) size 744x20
+ RenderText {#text} at (0,0) size 219x19
+ text run at (0,0) width 219: "This should be indented, not quoted."
RenderBlock {BLOCKQUOTE} at (8,28) size 768x38 [border: (1px dashed #AAAAAA)]
RenderText {#text} at (9,9) size 167x19
text run at (9,9) width 167: "This text should be Quoted."
-caret: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 1 {BLOCKQUOTE} 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/5481523-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt
index 20b6374..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
@@ -26,5 +26,7 @@ layer at (0,0) size 800x600
RenderTableCell {TD} at (43,28) size 33x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 29x19
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 1 {BODY} of child 0 {HTML} of document
-selection end: position 2 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/indent-selection-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum
index ed715ff..727722c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum
@@ -1 +1 @@
-463af3c7895e54785f4b7f8983751e28 \ No newline at end of file
+e818e8c4d030203585090ce7e9fde217 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png
index 17b2ed4..6a6770b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt
index c08f2fc..87c0887 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt
@@ -3,7 +3,7 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > BLOCKQUOTE > DIV > BODY > HTML > #document to 5 of #text > SPAN > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document to 5 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -17,43 +17,42 @@ layer at (0,0) size 800x600
RenderBlock (anonymous) at (0,20) size 784x20
RenderBR {BR} at (0,0) size 0x19
RenderBlock {DIV} at (0,40) size 784x212
- RenderBlock {BLOCKQUOTE} at (40,0) size 744x212
+ RenderBlock {BLOCKQUOTE} at (40,0) size 744x60
RenderBlock (anonymous) at (0,0) size 744x40
- RenderInline {SPAN} at (0,0) size 40x19
- RenderText {#text} at (0,0) size 40x19
- text run at (0,0) width 40: "Lorem"
+ RenderText {#text} at (0,0) size 40x19
+ text run at (0,0) width 40: "Lorem"
RenderBR {BR} at (40,15) size 0x0
RenderText {#text} at (0,20) size 80x19
text run at (0,20) width 80: "more Lorem!"
- RenderBlock {BLOCKQUOTE} at (40,40) size 704x132
- RenderBlock (anonymous) at (0,0) size 704x20
- RenderText {#text} at (0,0) size 35x19
- text run at (0,0) width 35: "ipsum"
- RenderBR {BR} at (35,15) size 0x0
- RenderBlock {UL} at (0,36) size 704x60
+ RenderBlock {BLOCKQUOTE} at (40,40) size 704x20
+ RenderText {#text} at (0,0) size 35x19
+ text run at (0,0) width 35: "ipsum"
+ RenderBlock (anonymous) at (0,60) size 784x0
+ RenderBlock {BLOCKQUOTE} at (40,76) size 744x60
+ RenderBlock {UL} at (0,0) size 744x60
+ RenderBlock {UL} at (40,0) size 704x60
RenderListItem {LI} at (40,0) size 664x20
- RenderListMarker at (-18,0) size 7x19: bullet
+ RenderListMarker at (-18,0) size 7x19: white bullet
RenderText {#text} at (0,0) size 25x19
text run at (0,0) width 25: "Foo"
RenderListItem {LI} at (40,20) size 664x20
- RenderListMarker at (-18,0) size 7x19: bullet
+ RenderListMarker at (-18,0) size 7x19: white bullet
RenderText {#text} at (0,0) size 22x19
text run at (0,0) width 22: "Bar"
RenderListItem {LI} at (40,40) size 664x20
- RenderListMarker at (-18,0) size 7x19: bullet
+ RenderListMarker at (-18,0) size 7x19: white bullet
RenderText {#text} at (0,0) size 23x19
text run at (0,0) width 23: "Baz"
- RenderBlock (anonymous) at (0,112) size 704x20
- RenderText {#text} at (0,0) size 35x19
- text run at (0,0) width 35: "Dolor"
- RenderBlock (anonymous) at (0,172) size 744x40
+ RenderBlock {BLOCKQUOTE} at (40,152) size 744x60
+ RenderBlock {BLOCKQUOTE} at (40,0) size 704x20
+ RenderText {#text} at (0,0) size 35x19
+ text run at (0,0) width 35: "Dolor"
+ RenderBlock (anonymous) at (0,20) size 744x40
RenderText {#text} at (0,0) size 32x19
text run at (0,0) width 32: "Sum!"
RenderBR {BR} at (32,15) size 0x0
- RenderInline {SPAN} at (0,0) size 33x19
- RenderText {#text} at (0,20) size 33x19
- text run at (0,20) width 33: "Thing"
+ RenderText {#text} at (0,20) size 33x19
+ text run at (0,20) width 33: "Thing"
RenderBlock (anonymous) at (0,212) size 784x0
- RenderText {#text} at (0,0) size 0x0
-selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 5 of child 0 {#text} of child 6 {SPAN} of child 1 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection start: position 0 of child 0 {#text} of child 1 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end: position 5 of child 3 {#text} of child 3 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document