Merge 67292 - 2010-09-11 Mihai Parparita <mihaip@chromium.org>...

WebCore/html/HTMLElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 248 matching lines @@
 String HTMLElement::innerHTML() const
 {
     return createMarkup(this, ChildrenOnly);
 }
 
 String HTMLElement::outerHTML() const
 {
     return createMarkup(this);
 }
 
-static bool useLegacyTreeBuilder(Document*)
-{
-    return false;
-}
-
 // FIXME: This logic should move into Range::createContextualFragment
 PassRefPtr<DocumentFragment> HTMLElement::deprecatedCreateContextualFragment(const String& markup, FragmentScriptingPermission scriptingPermission)
 {
     // The following is in accordance with the definition as used by IE.
     if (ieForbidsInsertHTML())
         return 0;
 
     if (hasLocalName(colTag) || hasLocalName(colgroupTag) || hasLocalName(framesetTag)
         || hasLocalName(headTag) || hasLocalName(styleTag) || hasLocalName(titleTag))
         return 0;
@@ skipping 50 matching lines @@
     element->removeChildren();
     element->appendChild(textNode.release(), ec);
 }
 
 // We may want to move a version of this function into DocumentFragment.h/cpp
 static PassRefPtr<DocumentFragment> createFragmentFromSource(const String& markup, Element* contextElement, ExceptionCode& ec)
 {
     Document* document = contextElement->document();
     RefPtr<DocumentFragment> fragment;
 
-    if (useLegacyTreeBuilder(document)) {
-        fragment = contextElement->deprecatedCreateContextualFragment(markup);
-        if (!fragment)
-            ec = NO_MODIFICATION_ALLOWED_ERR;
-        return fragment;
-    }
-
     fragment = DocumentFragment::create(document);
     if (document->isHTMLDocument()) {
         fragment->parseHTML(markup, contextElement);
         return fragment;
     }
 
     bool wasValid = fragment->parseXML(markup, contextElement);
     if (!wasValid) {
         ec = INVALID_STATE_ERR;
         return 0;
     }
     return fragment;
 }
 
 void HTMLElement::setInnerHTML(const String& html, ExceptionCode& ec)
 {
-    // FIXME: This code can be removed, it's handled by the HTMLDocumentParser correctly.
-    if (useLegacyTreeBuilder(document()) && (hasLocalName(scriptTag) || hasLocalName(styleTag))) {
-        // Script and CSS source shouldn't be parsed as HTML.
-        removeChildren();
-        appendChild(document()->createTextNode(html), ec);
-        return;
-    }
-
     RefPtr<DocumentFragment> fragment = createFragmentFromSource(html, this, ec);
     if (fragment)
         replaceChildrenWithFragment(this, fragment.release(), ec);
 }
 
 void HTMLElement::setOuterHTML(const String& html, ExceptionCode& ec)
 {
     Node* p = parent();
     if (!p || !p->isHTMLElement()) {
         ec = NO_MODIFICATION_ALLOWED_ERR;
@@ skipping 444 matching lines @@
 #ifndef NDEBUG
 
 // For use in the debugger
 void dumpInnerHTML(WebCore::HTMLElement*);
 
 void dumpInnerHTML(WebCore::HTMLElement* element)
 {
     printf("%s\n", element->innerHTML().ascii().data());
 }
 #endif