[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 11:52:40 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 32364a4f7ffe94525c9fbdd6b3e0ef90210fb381
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 10 10:49:34 2010 +0000
2010-08-10 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65056.
http://trac.webkit.org/changeset/65056
https://bugs.webkit.org/show_bug.cgi?id=43773
"Clearly I missed something. I'm too tired to try and fix
now. Will re-land in the morning." (Requested by eseidel on
#webkit).
* html/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::attach):
* html/HTMLElement.cpp:
(WebCore::HTMLElement::insertAdjacentHTML):
* html/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::processEndTagForInCell):
2010-08-10 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65056.
http://trac.webkit.org/changeset/65056
https://bugs.webkit.org/show_bug.cgi?id=43773
"Clearly I missed something. I'm too tired to try and fix
now. Will re-land in the morning." (Requested by eseidel on
#webkit).
* fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt: Removed.
* fast/dom/HTMLElement/insertAdjacentHTML-errors.html: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65064 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 01c3e08..bcbc6b5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-10 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65056.
+ http://trac.webkit.org/changeset/65056
+ https://bugs.webkit.org/show_bug.cgi?id=43773
+
+ "Clearly I missed something. I'm too tired to try and fix
+ now. Will re-land in the morning." (Requested by eseidel on
+ #webkit).
+
+ * fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt: Removed.
+ * fast/dom/HTMLElement/insertAdjacentHTML-errors.html: Removed.
+
2010-08-10 Yoshiki Hayashi <yhayashi at google.com>
Reviewed by Kent Tamura.
diff --git a/LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt b/LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt
deleted file mode 100644
index c788b47..0000000
--- a/LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Test insertAdjacentHTML exceptions to make sure they match HTML5
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS div.insertAdjacentHTML('beforeBegin', 'text') is undefined.
-PASS div.insertAdjacentHTML('afterEnd', 'text') is undefined.
-PASS div.insertAdjacentHTML('FOO', 'text') threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS document.documentElement.insertAdjacentHTML('afterEnd', 'text') threw exception Error: NO_MODIFICATION_ALLOWED_ERR: DOM Exception 7.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors.html b/LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors.html
deleted file mode 100644
index 6176575..0000000
--- a/LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../js/resources/js-test-style.css">
-<script src="../../js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/insertAdjacentHTML-errors.js"></script>
-<script src="../../js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9aa3362..790720b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-10 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65056.
+ http://trac.webkit.org/changeset/65056
+ https://bugs.webkit.org/show_bug.cgi?id=43773
+
+ "Clearly I missed something. I'm too tired to try and fix
+ now. Will re-land in the morning." (Requested by eseidel on
+ #webkit).
+
+ * html/HTMLConstructionSite.cpp:
+ (WebCore::HTMLConstructionSite::attach):
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::insertAdjacentHTML):
+ * html/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::processEndTagForInCell):
+
2010-08-10 Yoshiki Hayashi <yhayashi at google.com>
Reviewed by Kent Tamura.
diff --git a/WebCore/html/HTMLConstructionSite.cpp b/WebCore/html/HTMLConstructionSite.cpp
index 9f502e3..1a9a373 100644
--- a/WebCore/html/HTMLConstructionSite.cpp
+++ b/WebCore/html/HTMLConstructionSite.cpp
@@ -93,7 +93,7 @@ PassRefPtr<ChildType> HTMLConstructionSite::attach(Node* parent, PassRefPtr<Chil
// doesn't. It feels like we're missing a concept somehow.
if (shouldFosterParent()) {
fosterParent(child.get());
- ASSERT(child->attached() || !child->parent()->attached());
+ ASSERT(child->attached());
return child.release();
}
diff --git a/WebCore/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
index 3c3353c..6fc53a2 100644
--- a/WebCore/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -549,35 +549,13 @@ Element* HTMLElement::insertAdjacentElement(const String& where, Element* newChi
return static_cast<Element*>(returnValue);
}
-// Step 3 of http://www.whatwg.org/specs/web-apps/current-work/multipage/apis-in-html-documents.html#insertadjacenthtml()
-static Element* contextElementForInsertion(const String& where, Element* element, ExceptionCode& ec)
-{
- if (equalIgnoringCase(where, "beforeBegin") || equalIgnoringCase(where, "afterEnd")) {
- Node* parent = element->parentNode();
- if (parent && parent->isDocumentNode()) {
- ec = NO_MODIFICATION_ALLOWED_ERR;
- return 0;
- }
- ASSERT(!parent || parent->isElementNode());
- return static_cast<Element*>(parent);
- }
- if (equalIgnoringCase(where, "afterBegin") || equalIgnoringCase(where, "beforeEnd"))
- return element;
- ec = SYNTAX_ERR;
- return 0;
-}
-
void HTMLElement::insertAdjacentHTML(const String& where, const String& markup, ExceptionCode& ec)
{
RefPtr<DocumentFragment> fragment = document()->createDocumentFragment();
- Element* contextElement = contextElementForInsertion(where, this, ec);
- if (!contextElement)
- return;
-
if (document()->isHTMLDocument())
- fragment->parseHTML(markup, contextElement);
+ fragment->parseHTML(markup, this);
else {
- if (!fragment->parseXML(markup, contextElement))
+ if (!fragment->parseXML(markup, this))
// FIXME: We should propagate a syntax error exception out here.
return;
}
diff --git a/WebCore/html/HTMLTreeBuilder.cpp b/WebCore/html/HTMLTreeBuilder.cpp
index fc0b9d0..2c7d40d 100644
--- a/WebCore/html/HTMLTreeBuilder.cpp
+++ b/WebCore/html/HTMLTreeBuilder.cpp
@@ -1997,9 +1997,7 @@ void HTMLTreeBuilder::processEndTagForInCell(AtomicHTMLToken& token)
m_tree.openElements()->popUntilPopped(token.name());
m_tree.activeFormattingElements()->clearToLastMarker();
setInsertionMode(InRowMode);
- // FIXME: The fragment case of this ASSERT is a spec bug:
- // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10338
- ASSERT(m_tree.currentElement()->hasTagName(trTag) || (isParsingFragment() && m_fragmentContext.contextElement()->hasTagName(trTag)));
+ ASSERT(m_tree.currentElement()->hasTagName(trTag));
return;
}
if (token.name() == bodyTag
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list