summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-28 18:08:04 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-28 18:08:04 +0000
commit3befa6ec5970a2a04756e5d10351f261250ddb99 (patch)
tree50b718da49d1fb57d24d6a6ebb6d3e4fd5ba3f72 /webkit
parent8f400713cf3f27f701f8586b44536784563441c2 (diff)
downloadchromium_src-3befa6ec5970a2a04756e5d10351f261250ddb99.zip
chromium_src-3befa6ec5970a2a04756e5d10351f261250ddb99.tar.gz
chromium_src-3befa6ec5970a2a04756e5d10351f261250ddb99.tar.bz2
This test checks the JS notifications when loading a frame.
This CL reverts the previous base-lining in the results, as the notifications order is now as expected. We still need to have a baseline because of some font related size inaccuracies in the DOM dump. Review URL: http://codereview.chromium.org/19406 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/simple-subframe-expected.txt2
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/simple-subframe-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/simple-subframe-expected.txt
index 8082899..abde8dd 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/simple-subframe-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/simple-subframe-expected.txt
@@ -3,9 +3,9 @@ main frame - didCommitLoadForFrame
frame "f1" - didStartProvisionalLoadForFrame
main frame - didFinishDocumentLoadForFrame
frame "f1" - didCommitLoadForFrame
+frame "f1" - didFinishDocumentLoadForFrame
frame "f1" - didHandleOnloadEventsForFrame
main frame - didHandleOnloadEventsForFrame
-frame "f1" - didFinishDocumentLoadForFrame
frame "f1" - didFinishLoadForFrame
main frame - didFinishLoadForFrame
layer at (0,0) size 800x600
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 00373f7..5ae5a6c 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1550,7 +1550,7 @@ LayoutTests/fast/dom/dom-constructors.html = FAIL
// WebKit Merge 39050:39100 failures:
LayoutTests/fast/dom/java-applet-calls.html = FAIL
LINUX WIN : LayoutTests/fast/repaint/transform-repaint-descendants.html = FAIL
-LINUX WIN : LayoutTests/http/tests/loading/simple-subframe.html = FAIL
+LINUX : LayoutTests/http/tests/loading/simple-subframe.html = FAIL
// WebKit Merge 39100:39141 new tests:
MAC : LayoutTests/fast/events/special-key-events-in-input-text.html = FAIL