One more layout test...

WebKit's r40672 merged EventTargetNode up into Node, 
so the expectations for the test has changed (they 
output 1 fewer node).

This matches WebKit's expected result change.

Review URL: http://codereview.chromium.org/20236

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9521 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 17 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/prototype-chain-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/prototype-chain-expected.txt
index bf43c49..0e23706 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/prototype-chain-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/prototype-chain-expected.txt
@@ -2,7 +2,7 @@ This page prints out the prototype chains of select DOM objects. Older versions
 
 NOTE: This test will start failing if you change the layout of a related prototype chain in WebCore. That does not necessarily mean that you have done something wrong; you may just need to check in new results.
 
------ [object HTMLDocument] (5 prototypes) -----
+----- [object HTMLDocument] (4 prototypes) -----
 
 [object Object]
 
@@ -12,11 +12,7 @@ NOTE: This test will start failing if you change the layout of a related prototy
 
 [object Object]
 
-[object Object]
-
------ [object HTMLDivElement] (6 prototypes) -----
-
-[object Object]
+----- [object HTMLDivElement] (5 prototypes) -----
 
 [object Object]
 
@@ -28,9 +24,7 @@ NOTE: This test will start failing if you change the layout of a related prototy
 
 [object Object]
 
------ [object HTMLFormElement] (6 prototypes) -----
-
-[object Object]
+----- [object HTMLFormElement] (5 prototypes) -----
 
 [object Object]
 
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 3ba5e85..4e9eae5 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -323,6 +323,7 @@ DEFER WIN LINUX : LayoutTests/fast/inline/dirtyLinesForInline.html = PASS FAIL
 LINUX : LayoutTests/fast/compact/001.html = FAIL
 LINUX : LayoutTests/fast/compact/002.html = FAIL
 DEFER LINUX : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
+MAC LINUX : LayoutTests/fast/dom/prototype-chain.html = FAIL
 MAC LINUX : LayoutTests/fast/inline/percentage-margins.html = FAIL
 MAC : LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
 LINUX : LayoutTests/fast/runin/002.html = FAIL
@@ -1489,8 +1490,8 @@ SKIP : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-loaded-svg
 
 // Windows pixeltest failure: alpha=0.5 red does not come out blended.
 // Linux pixeltest failure: alpha=0.5 red (1,0,0) atop yellow (1,1,0) is
-// coming out with with a slightly-less-than-100% red channel.
-// Looks like we need to investigate HSL color conversion.
+// coming out with with a slightly-less-than-100% red channel. This test fails
+// because we enforce non-transparent color in Font::drawGlyphs. See <b/700464>.
 LINUX WIN : LayoutTests/fast/css/hsla-color.html = FAIL
 
 // Windows pixeltest failure: upstream baseline has the background of the
@@ -1743,12 +1744,6 @@ LINUX : LayoutTests/svg/text/text-path-01-b.svg = FAIL
 // jshin@chromium.org did several font related changes in this merge.
 LINUX : LayoutTests/fast/css/text-overflow-ellipsis.html = FAIL
 
-// This is related to merging EventTargetNode into Node, but I don't understand
-// this well enough to know if this just needs a rebase. One of the V8 folk
-// should take a look at this. The upstream expected results changed as well,
-// but differently than ours did.
-LayoutTests/fast/dom/prototype-chain.html = FAIL
-
 // Started failing with webkit merge 40539:40668
 MAC DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL