Skip to content

GitLab

T
tangled
Commit ac869297 authored by weinig@apple.com's avatar weinig@apple.com
Browse files
Options

WebCore: 

2009-04-14  Sam Weinig  <sam@webkit.org>

        Reviewed by Darin Adler.

        Part of <rdar://problem/6150868>
        Fix incorrect handling of content that needs to go into the head element
        once the head element has been removed.

        Test: fast/parser/head-content-after-head-removal.html

        * html/HTMLParser.cpp:
        (WebCore::HTMLParser::HTMLParser): Remove unneeded initializer of m_head.
        (WebCore::HTMLParser::handleError): Update since m_head is now a RefPtr.
        (WebCore::HTMLParser::createHead): Ditto.
        * html/HTMLParser.h: Make m_head a RefPtr.

LayoutTests:

2009-04-14  Sam Weinig  <sam@webkit.org>

        Reviewed by Darin Adler.

        Part of <rdar://problem/6150868>
        Test for incorrect handling of content that needs to go into the head element
        once the head element has been removed.

        * fast/parser/head-content-after-head-removal-expected.txt: Added.
        * fast/parser/head-content-after-head-removal.html: Added.



git-svn-id: svn://svn.chromium.org/blink/trunk@42532 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e85d1560
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 7 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ ac869297
2009-04-14 Sam Weinig <sam@webkit.org>
Reviewed by Darin Adler.
Part of <rdar://problem/6150868>
Test for incorrect handling of content that needs to go into the head element
once the head element has been removed.
* fast/parser/head-content-after-head-removal-expected.txt: Added.
* fast/parser/head-content-after-head-removal.html: Added.
2009-04-14 Adam Roben <aroben@apple.com> 2009-04-14 Adam Roben <aroben@apple.com>
Skip another test that sometimes times out on Windows Skip another test that sometimes times out on Windows
......
third_party/WebKit/LayoutTests/fast/parser/head-content-after-head-removal-expected.txt 0 → 100644
View file @ ac869297
If you can see this text without crashing, the test passed. Note: The title element did not end up in the document.
third_party/WebKit/LayoutTests/fast/parser/head-content-after-head-removal.html 0 → 100644
View file @ ac869297
<head></head>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
// Blow away the <head> element above in a way that doesn't create a JavaScript wrapper.
document.documentElement.innerHTML = "";
</script>
<title>
This element gets put into the head by the parser, but we deleted the head!
</title>
<body>
If you can see this text without crashing, the test passed.
<script>
if (document.getElementsByTagName("title").length)
document.write(" Note: The title element did end up in the document.");
else
document.write(" Note: The title element did not end up in the document.");
</script>
</body>
third_party/WebKit/WebCore/ChangeLog
View file @ ac869297
2009-04-14 Sam Weinig <sam@webkit.org>
Reviewed by Darin Adler.
Part of <rdar://problem/6150868>
Fix incorrect handling of content that needs to go into the head element
once the head element has been removed.
Test: fast/parser/head-content-after-head-removal.html
* html/HTMLParser.cpp:
(WebCore::HTMLParser::HTMLParser): Remove unneeded initializer of m_head.
(WebCore::HTMLParser::handleError): Update since m_head is now a RefPtr.
(WebCore::HTMLParser::createHead): Ditto.
* html/HTMLParser.h: Make m_head a RefPtr.
2009-04-14 Geoffrey Garen <ggaren@apple.com> 2009-04-14 Geoffrey Garen <ggaren@apple.com>
Used svn merge -r42529:42528 to roll out my last patch because it broke Used svn merge -r42529:42528 to roll out my last patch because it broke
third_party/WebKit/WebCore/html/HTMLParser.cpp
View file @ ac869297
...@@ -126,7 +126,6 @@ HTMLParser::HTMLParser(HTMLDocument* doc, bool reportErrors) ...@@ -126,7 +126,6 @@ HTMLParser::HTMLParser(HTMLDocument* doc, bool reportErrors)
, m_blockStack(0) , m_blockStack(0)
, m_blocksInStack(0) , m_blocksInStack(0)
, m_hasPElementInScope(NotInScope) , m_hasPElementInScope(NotInScope)
, m_head(0)
, m_inBody(false) , m_inBody(false)
, m_haveContent(false) , m_haveContent(false)
, m_haveFrameSet(false) , m_haveFrameSet(false)
...@@ -144,7 +143,6 @@ HTMLParser::HTMLParser(DocumentFragment* frag) ...@@ -144,7 +143,6 @@ HTMLParser::HTMLParser(DocumentFragment* frag)
, m_blockStack(0) , m_blockStack(0)
, m_blocksInStack(0) , m_blocksInStack(0)
, m_hasPElementInScope(NotInScope) , m_hasPElementInScope(NotInScope)
, m_head(0)
, m_inBody(true) , m_inBody(true)
, m_haveContent(false) , m_haveContent(false)
, m_haveFrameSet(false) , m_haveFrameSet(false)
...@@ -506,8 +504,7 @@ bool HTMLParser::handleError(Node* n, bool flat, const AtomicString& localName, ...@@ -506,8 +504,7 @@ bool HTMLParser::handleError(Node* n, bool flat, const AtomicString& localName,
elt->hasLocalName(baseTag))) { elt->hasLocalName(baseTag))) {
if (!m_head) { if (!m_head) {
m_head = new HTMLHeadElement(headTag, m_document); m_head = new HTMLHeadElement(headTag, m_document);
e = m_head; insertNode(m_head.get());
insertNode(e);
handled = true; handled = true;
} }
} else { } else {
...@@ -1516,14 +1513,14 @@ void HTMLParser::createHead() ...@@ -1516,14 +1513,14 @@ void HTMLParser::createHead()
m_head = new HTMLHeadElement(headTag, m_document); m_head = new HTMLHeadElement(headTag, m_document);
HTMLElement* body = m_document->body(); HTMLElement* body = m_document->body();
ExceptionCode ec = 0; ExceptionCode ec = 0;
m_document->documentElement()->insertBefore(m_head, body, ec); m_document->documentElement()->insertBefore(m_head.get(), body, ec);
if (ec) if (ec)
m_head = 0; m_head = 0;
// If the body does not exist yet, then the <head> should be pushed as the current block. // If the body does not exist yet, then the <head> should be pushed as the current block.
if (m_head && !body) { if (m_head && !body) {
pushBlock(m_head->localName(), m_head->tagPriority()); pushBlock(m_head->localName(), m_head->tagPriority());
setCurrent(m_head); setCurrent(m_head.get());
} }
} }
......
third_party/WebKit/WebCore/html/HTMLParser.h
View file @ ac869297
...@@ -169,7 +169,7 @@ private: ...@@ -169,7 +169,7 @@ private:
RefPtr<HTMLFormElement> m_currentFormElement; // currently active form RefPtr<HTMLFormElement> m_currentFormElement; // currently active form
RefPtr<HTMLMapElement> m_currentMapElement; // current map RefPtr<HTMLMapElement> m_currentMapElement; // current map
HTMLHeadElement* m_head; // head element; needed for HTML which defines <base> after </head> RefPtr<HTMLHeadElement> m_head; // head element; needed for HTML which defines <base> after </head>
RefPtr<Node> m_isindexElement; // a possible <isindex> element in the head RefPtr<Node> m_isindexElement; // a possible <isindex> element in the head
bool m_inBody; bool m_inBody;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment