summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 17:45:51 +0000
committeryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 17:45:51 +0000
commit0c07634b9b612f196801084cf350a9da153b1c86 (patch)
tree548b847a97212ee3e1536af4c9e22a51d00232ae /webkit
parentd643226d0d4e79338a8393fb7c6c84ca7bb470cb (diff)
downloadchromium_src-0c07634b9b612f196801084cf350a9da153b1c86.zip
chromium_src-0c07634b9b612f196801084cf350a9da153b1c86.tar.gz
chromium_src-0c07634b9b612f196801084cf350a9da153b1c86.tar.bz2
webkit roll 49583:49597
Review URL: http://codereview.chromium.org/274062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt1
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt11
2 files changed, 9 insertions, 3 deletions
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 029fdab..539ec15 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
@@ -21,7 +21,6 @@ layer at (0,0) size 800x600
RenderBR {BR} at (304,154) size 0x0
RenderTextControl {INPUT} at (2,156) size 215x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (12,203) size 211x16
RenderBlock {DIV} at (2,3) size 211x16
RenderText {#text} at (1,0) size 190x16
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bf37eec..30a202f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -883,6 +883,7 @@ BUG6735 MAC : LayoutTests/plugins/netscape-throw-exception.html = FAIL
BUG10432 WIN LINUX : LayoutTests/fast/overflow/004.html = FAIL
+//also BUG24863
BUG9071 MAC WIN DEBUG SLOW : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = FAIL PASS
BUG9071 LINUX : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = FAIL
@@ -979,7 +980,7 @@ BUG10296 LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t.svg = FAIL
BUG10296 LINUX : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-14-b.svg = FAIL
// Pixel test passes. Texts differ by 1 on SVGRenderText bounding box.
-BUG10297 LINUX : LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html = FAIL
+BUG10297 LINUX WIN : LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html = FAIL
// No anti-aliasing on the text.
BUG10298 LINUX : LayoutTests/svg/custom/use-on-disallowed-foreign-object-3.svg = FAIL
@@ -2594,6 +2595,7 @@ BUG9798 WIN SLOW : LayoutTests/transitions/change-values-during-transition.html
BUG9798 LINUX : LayoutTests/transitions/extra-transition.html = TIMEOUT PASS
BUG9798 LINUX : LayoutTests/transitions/interrupt-zero-duration.html = FAIL PASS
BUG9798 LINUX DEBUG : LayoutTests/transitions/interrupted-all-transition.html = FAIL PASS
+//also BUG24868 (crash)
BUG9798 LINUX : LayoutTests/transitions/mask-transitions.html = FAIL PASS CRASH
BUG9798 LINUX DEBUG : LayoutTests/transitions/multiple-background-transitions.html = FAIL PASS
BUG9798 LINUX DEBUG : LayoutTests/transitions/multiple-shadow-transitions.html = FAIL PASS
@@ -3170,4 +3172,9 @@ BUG_DIMICH : LayoutTests/fast/events/add-event-without-document.html = TIMEOUT
//WebKit roll 49562:49583
SKIP BUG_PFELDMAN : LayoutTests/inspector = FAIL
BUG24854 WIN LINUX : LayoutTests/fast/forms/menulist-no-renderer-onmousedown.html = CRASH
-BUG_YAAR LINUX : LayoutTests/fast/replaced/border-radius-clip.html = FAIL
+BUG24855 WIN LINUX : LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL
+
+BUG24862 LINUX : LayoutTests/fast/replaced/border-radius-clip.html = FAIL
+
+// WebKit roll 49583:49597
+BUG24865 WIN : LayoutTests/fast/css/large-number-round-trip.html = FAIL