From f486d19d62f1bc33246748b14b14a9dfa617b57f Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Thu, 19 Aug 2010 17:55:56 +0100 Subject: Merge WebKit at r65615 : Initial merge by git. Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79 --- WebCore/html/HTMLDocument.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'WebCore/html/HTMLDocument.cpp') diff --git a/WebCore/html/HTMLDocument.cpp b/WebCore/html/HTMLDocument.cpp index bc9de97..4e26c02 100644 --- a/WebCore/html/HTMLDocument.cpp +++ b/WebCore/html/HTMLDocument.cpp @@ -68,7 +68,6 @@ #include "HTMLBodyElement.h" #include "HTMLElementFactory.h" #include "HTMLNames.h" -#include "LegacyHTMLDocumentParser.h" #include "InspectorController.h" #include "KURL.h" #include "Page.h" @@ -290,11 +289,7 @@ DocumentParser* HTMLDocument::createParser() if (Page* page = this->page()) reportErrors = page->inspectorController()->windowVisible(); #endif - - if (settings() && settings()->html5ParserEnabled()) - return new HTMLDocumentParser(this, reportErrors); - - return new LegacyHTMLDocumentParser(this, reportErrors); + return new HTMLDocumentParser(this, reportErrors); } // -------------------------------------------------------------------------- @@ -328,9 +323,9 @@ void HTMLDocument::removeItemFromMap(HashCountedSet& map, con { if (name.isEmpty()) return; + map.remove(name.impl()); if (Frame* f = frame()) f->script()->namedItemRemoved(this, name); - map.remove(name.impl()); } void HTMLDocument::addNamedItem(const AtomicString& name) -- cgit v1.1