diff options
| author | Steve Block <steveblock@google.com> | 2010-08-24 07:50:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-24 07:50:47 -0700 |
| commit | c570a147a94b126d4172c30914f53dea17b4c8f5 (patch) | |
| tree | 99c11741887d21f65d67c5bbdab58b7ba2a5d4d5 /WebCore/html/HTMLDocument.cpp | |
| parent | c952714bc6809a5ad081baaf9fcc04107b92ea3f (diff) | |
| parent | 6c65f16005b91786c2b7c0791b9ea1dd684d57f4 (diff) | |
| download | external_webkit-c570a147a94b126d4172c30914f53dea17b4c8f5.zip external_webkit-c570a147a94b126d4172c30914f53dea17b4c8f5.tar.gz external_webkit-c570a147a94b126d4172c30914f53dea17b4c8f5.tar.bz2 | |
Merge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4
* changes:
Merge WebKit at r65615 : Update WebKit revision number
Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
Merge WebKit at r65615 : Android-specific results for Geolocation tests.
Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
Merge WebKit at r65615 : processingUserGesture() is now static.
Merge WebKit at r65615 : UTF8String() becomes utf8().
Merge WebKit at r65615 : Fix include paths for string headers.
Merge WebKit at r65615 : Fix Makefiles.
Merge WebKit at r65615 : Fix conflicts.
Merge WebKit at r65615 : Initial merge by git.
Diffstat (limited to 'WebCore/html/HTMLDocument.cpp')
| -rw-r--r-- | WebCore/html/HTMLDocument.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
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<AtomicStringImpl*>& 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) |