From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- LayoutTests/fast/encoding/external-script-charset-expected.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'LayoutTests/fast/encoding/external-script-charset-expected.txt') diff --git a/LayoutTests/fast/encoding/external-script-charset-expected.txt b/LayoutTests/fast/encoding/external-script-charset-expected.txt index 6575759..0b4c6df 100644 --- a/LayoutTests/fast/encoding/external-script-charset-expected.txt +++ b/LayoutTests/fast/encoding/external-script-charset-expected.txt @@ -1,3 +1,5 @@ Test that external scripts in XHTML documents inherit document charset. -PASS +Javascript 1 (original document charset): PASS + +Javascript 2 (after document.charset was set): PASS -- cgit v1.1