[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 11:24:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6d561241acaf6137c8e87696070383af796ff166
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 22 01:04:59 2010 +0000
2010-07-21 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Implement spec changes for basefont and bgsound
https://bugs.webkit.org/show_bug.cgi?id=42792
* html/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::processStartTagForInBody):
(WebCore::HTMLTreeBuilder::processStartTag):
(WebCore::HTMLTreeBuilder::processStartTagForInHead):
2010-07-21 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Implement spec changes for basefont and bgsound
https://bugs.webkit.org/show_bug.cgi?id=42792
* html5lib/runner-expected-html5.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5641484..69162c0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,15 @@
Reviewed by Eric Seidel.
+ Implement spec changes for basefont and bgsound
+ https://bugs.webkit.org/show_bug.cgi?id=42792
+
+ * html5lib/runner-expected-html5.txt:
+
+2010-07-21 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
Update a list of tags to match changes in the HTML5 spec
https://bugs.webkit.org/show_bug.cgi?id=42791
diff --git a/LayoutTests/html5lib/runner-expected-html5.txt b/LayoutTests/html5lib/runner-expected-html5.txt
index 0bf8399..af7607c 100644
--- a/LayoutTests/html5lib/runner-expected-html5.txt
+++ b/LayoutTests/html5lib/runner-expected-html5.txt
@@ -178,15 +178,11 @@ resources/tests19.dat:
1
22
24
-57
-58
63
77
78
80
81
-99
-100
101
102
@@ -252,36 +248,6 @@ Expected:
| "abc"
| "foo"
-Test 57 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><basefont><frameset>
-Got:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <basefont>
-Expected:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <basefont>
-| <frameset>
-
-Test 58 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><bgsound><frameset>
-Got:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <bgsound>
-Expected:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <bgsound>
-| <frameset>
-
Test 63 of 102 in resources/tests19.dat failed. Input:
<!doctype html><keygen><frameset>
Got:
@@ -353,46 +319,6 @@ Expected:
| <head>
| <frameset>
-Test 99 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><a><b></a><basefont>
-Got:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <a>
-| <b>
-| <b>
-| <basefont>
-Expected:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <a>
-| <b>
-| <basefont>
-
-Test 100 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><a><b></a><bgsound>
-Got:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <a>
-| <b>
-| <b>
-| <bgsound>
-Expected:
-| <!DOCTYPE html>
-| <html>
-| <head>
-| <body>
-| <a>
-| <b>
-| <bgsound>
-
Test 101 of 102 in resources/tests19.dat failed. Input:
<!doctype html><figcaption><article></figcaption>a
Got:
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 195b414..6116394 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Eric Seidel.
+ Implement spec changes for basefont and bgsound
+ https://bugs.webkit.org/show_bug.cgi?id=42792
+
+ * html/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::processStartTagForInBody):
+ (WebCore::HTMLTreeBuilder::processStartTag):
+ (WebCore::HTMLTreeBuilder::processStartTagForInHead):
+
+2010-07-21 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
Update a list of tags to match changes in the HTML5 spec
https://bugs.webkit.org/show_bug.cgi?id=42791
diff --git a/WebCore/html/HTMLTreeBuilder.cpp b/WebCore/html/HTMLTreeBuilder.cpp
index f02f125..6aca72f 100644
--- a/WebCore/html/HTMLTreeBuilder.cpp
+++ b/WebCore/html/HTMLTreeBuilder.cpp
@@ -769,6 +769,8 @@ void HTMLTreeBuilder::processStartTagForInBody(AtomicHTMLToken& token)
return;
}
if (token.name() == baseTag
+ || token.name() == basefontTag
+ || token.name() == "bgsound"
|| token.name() == "command"
|| token.name() == linkTag
|| token.name() == metaTag
@@ -928,8 +930,6 @@ void HTMLTreeBuilder::processStartTagForInBody(AtomicHTMLToken& token)
// Note the fall through to the imgTag handling below!
}
if (token.name() == areaTag
- || token.name() == basefontTag
- || token.name() == "bgsound"
|| token.name() == brTag
|| token.name() == embedTag
|| token.name() == imgTag
@@ -1232,6 +1232,8 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken& token)
return;
}
if (token.name() == baseTag
+ || token.name() == basefontTag
+ || token.name() == "bgsound"
|| token.name() == linkTag
|| token.name() == metaTag
|| token.name() == noframesTag
@@ -1377,7 +1379,9 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken& token)
m_tree.insertHTMLHtmlStartTagInBody(token);
return;
}
- if (token.name() == linkTag
+ if (token.name() == basefontTag
+ || token.name() == "bgsound"
+ || token.name() == linkTag
|| token.name() == metaTag
|| token.name() == noframesTag
|| token.name() == styleTag) {
@@ -2738,6 +2742,8 @@ bool HTMLTreeBuilder::processStartTagForInHead(AtomicHTMLToken& token)
}
// FIXME: Atomize "command".
if (token.name() == baseTag
+ || token.name() == basefontTag
+ || token.name() == "bgsound"
|| token.name() == "command"
|| token.name() == linkTag
|| token.name() == metaTag) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list