summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-26 00:22:51 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-26 00:22:51 +0000
commit2b00c1b40bee8755412ed09ae2cbfa5d9114f2da (patch)
tree7cce97850a2bebe85c05fc64bcda91358fc569e4 /webkit
parent42030611f1382f14631bdd8a9b1cfc6a219892af (diff)
downloadchromium_src-2b00c1b40bee8755412ed09ae2cbfa5d9114f2da.zip
chromium_src-2b00c1b40bee8755412ed09ae2cbfa5d9114f2da.tar.gz
chromium_src-2b00c1b40bee8755412ed09ae2cbfa5d9114f2da.tar.bz2
Rebaseline a Linux layout test.
The div is taller on Linux, looks like by about 1px per line. Matchin Windows font metrics in RTL = :(. BUG=11122 Review URL: http://codereview.chromium.org/235032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.pngbin0 -> 8622 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.txt18
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt4
4 files changed, 19 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.checksum
new file mode 100644
index 0000000..0b450bf
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.checksum
@@ -0,0 +1 @@
+104975404a6e912e618ee431969964f7 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.png
new file mode 100644
index 0000000..af9dc2d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.txt
new file mode 100644
index 0000000..b8c68fc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/caret-rtl-expected.txt
@@ -0,0 +1,18 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+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 (anonymous) at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 537x19
+ text run at (0,0) width 537: "This tests that clicking in a contenteditable div will set the caret in the right edge of the div "
+ RenderBR {BR} at (537,15) size 0x0
+ RenderBlock {P} at (0,36) size 784x20
+ RenderText {#text} at (0,0) size 380x19
+ text run at (0,0) width 380: "Click in the div, the caret should be on the right edge of the div."
+ RenderBlock {DIV} at (0,72) size 200x382
+caret: position 0 of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 696f4d2..e11a57d 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1841,10 +1841,6 @@ BUG10055 LINUX DEBUG : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL PASS
// to include window.showModalDialog, which we give as undefined.
BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL
-// Need rebaselining for Linux, from WebKit merge 42580:42609
-// The content editable div is wider on linux than on windows.
-BUG11122 LINUX : LayoutTests/fast/forms/caret-rtl.html = FAIL
-
// New tests from WebKit Merge 42609:42671
BUG10760 LINUX : LayoutTests/fast/forms/input-text-scroll-left-on-blur.html = FAIL
BUG10760 LINUX : LayoutTests/fast/inline/25277-2.html = FAIL