diff options
author | Steve Block <steveblock@google.com> | 2010-09-02 10:54:48 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-02 10:54:48 -0700 |
commit | f6ffd316a876667639ddcf06cf4ee871720eea6e (patch) | |
tree | 97bb74158fe5c375bff2fab2b94da00ba8001883 /LayoutTests/dom | |
parent | 4e9b7f025feaa716f0f5f78b3653fe5c3c06fb5b (diff) | |
parent | f96186364aad870e1055753aa2849759f5c2dbef (diff) | |
download | external_webkit-f6ffd316a876667639ddcf06cf4ee871720eea6e.zip external_webkit-f6ffd316a876667639ddcf06cf4ee871720eea6e.tar.gz external_webkit-f6ffd316a876667639ddcf06cf4ee871720eea6e.tar.bz2 |
Merge changes I54430bd1,I61a04cf7,I4961f561,I36170123,I5dc94bad,Ie2e1440f
* changes:
Merge WebKit at r66079 : Update WebKit revision
Merge WebKit at r66079 : Cherry-pick WebKit change 66211 to add missing IndexedDB guards
Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha argument
Merge WebKit at r66079 : Fix makefiles
Merge WebKit at r66079 : Fix conflicts
Merge WebKit at r66079 : Initial merge by git
Diffstat (limited to 'LayoutTests/dom')
10 files changed, 11 insertions, 19 deletions
diff --git a/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt b/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt index 638218f..fcab69c 100644 --- a/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/canonicalform06 -Status error -Message Error: INVALID_CHARACTER_ERR: DOM Exception 5 +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt index 433fffe..f3287c3 100644 --- a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion01 -Status failure -Message NOT_SUPPORTED_ERR_documentsetversion01: assertTrue failed +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt index 43b8785..410e075 100644 --- a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt @@ -1,2 +1,3 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion03 -Status Success +Status error +Message Error: NOT_SUPPORTED_ERR: DOM Exception 9 diff --git a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt index 895671f..29e6b80 100644 --- a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion05 -Status failure -Message throw_NOT_SUPPORTED_ERR: assertTrue failed +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt b/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt index ff8224e..ba42393 100644 --- a/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset06 -Status error -Message Error: INVALID_CHARACTER_ERR: DOM Exception 5 +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt b/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt index d13c99f..bb966c4 100644 --- a/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07 -Status error -Message Error: INVALID_CHARACTER_ERR: DOM Exception 5 +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt index 3f1d8a4..f41d401 100644 --- a/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed01 -Status error -Message Error: INVALID_CHARACTER_ERR: DOM Exception 5 +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt index f475595..2877cd0 100644 --- a/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed02 -Status error -Message Error: INVALID_CHARACTER_ERR: DOM Exception 5 +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt index 8533c15..ab62919 100644 --- a/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03 -Status error -Message Error: INVALID_CHARACTER_ERR: DOM Exception 5 +Status Success diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt index d2a8f9d..6a67db7 100644 --- a/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt +++ b/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt @@ -1,3 +1,2 @@ Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed04 -Status error -Message Error: INVALID_CHARACTER_ERR: DOM Exception 5 +Status Success |