summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-07 17:31:10 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-07 17:31:10 +0000
commit9d207f652542ffdefe16af057b86d9fabd5cf214 (patch)
tree37c8c509d9177747cba7f00d0edb7996ac7e69a6 /webkit/data
parentdbba0c455f8b3f139fbfd9634d0bfba268085a33 (diff)
downloadchromium_src-9d207f652542ffdefe16af057b86d9fabd5cf214.zip
chromium_src-9d207f652542ffdefe16af057b86d9fabd5cf214.tar.gz
chromium_src-9d207f652542ffdefe16af057b86d9fabd5cf214.tar.bz2
Clean up test expectations from 54340:54465 WebKit Roll.
TBR=senorblanco TEST=none BUG=none Review URL: http://codereview.chromium.org/577045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/scrollbar-double-click-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt10
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-013-expected.txt10
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-017-expected.txt10
4 files changed, 16 insertions, 15 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/scrollbar-double-click-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/scrollbar-double-click-expected.txt
new file mode 100644
index 0000000..51e0aca
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/scrollbar-double-click-expected.txt
@@ -0,0 +1 @@
+Scroll offset is 700
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
index a2cea6b..a0447a8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-012-expected.txt
@@ -7,7 +7,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > DIV > SPAN > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > SPAN > DIV > BODY > HTML > #document to 0 of DIV > DIV > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -36,12 +36,12 @@ layer at (0,0) size 800x600
RenderInline {SPAN} at (0,0) size 0x0
RenderBlock (anonymous) at (14,14) size 756x132
RenderBlock {DIV} at (0,0) size 756x132 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 728x80
+ RenderBlock {DIV} at (14,38) size 728x28
RenderBlock {BLOCKQUOTE} at (40,0) size 648x28
RenderText {#text} at (0,0) size 32x27
text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (0,52) size 728x28
- RenderBR {BR} at (0,0) size 0x27
+ RenderBlock {DIV} at (14,90) size 728x28
+ RenderBR {BR} at (0,0) size 0x27
RenderBlock (anonymous) at (14,146) size 756x0
RenderInline {SPAN} at (0,0) size 0x0
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 0 {DIV} of child 0 {SPAN} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 0 {SPAN} of child 7 {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-text-013-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-013-expected.txt
index b1eb11c..9833c58 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-013-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-013-expected.txt
@@ -10,7 +10,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -38,10 +38,10 @@ layer at (0,0) size 800x600
RenderText {#text} at (14,14) size 12x27
text run at (14,14) width 12: "x"
RenderBlock {DIV} at (0,224) size 784x132 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 756x80
+ RenderBlock {DIV} at (14,38) size 756x28
RenderBlock {BLOCKQUOTE} at (40,0) size 676x28
RenderText {#text} at (0,0) size 32x27
text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (0,52) size 756x28
- RenderBR {BR} at (0,0) size 0x27
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 8 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderBlock {DIV} at (14,90) size 756x28
+ RenderBR {BR} at (0,0) size 0x27
+caret: position 0 of child 0 {BR} of child 1 {DIV} of child 8 {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-text-017-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-017-expected.txt
index fe5928a..c458cbc 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-017-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-017-expected.txt
@@ -6,7 +6,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 5 of #text > DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -40,14 +40,14 @@ layer at (0,0) size 800x600
text run at (0,0) width 35: "one"
RenderBlock {DIV} at (2,30) size 780x28
RenderBR {BR} at (0,0) size 0x27
- RenderBlock {DIV} at (2,58) size 780x56
+ RenderBlock {DIV} at (2,58) size 780x28
RenderBlock {DIV} at (0,0) size 780x28
RenderText {#text} at (0,0) size 36x27
text run at (0,0) width 36: "two"
RenderBlock (anonymous) at (0,28) size 780x0
- RenderBlock {DIV} at (0,28) size 780x28
- RenderBR {BR} at (0,0) size 0x27
+ RenderBlock {DIV} at (2,86) size 780x28
+ RenderBR {BR} at (0,0) size 0x27
RenderBlock {DIV} at (2,114) size 780x28
RenderText {#text} at (0,0) size 49x27
text run at (0,0) width 49: "three"
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 5 {DIV} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {BR} of child 6 {DIV} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document