Remove CDATASection

Source/core/xml/parser/XMLDocumentParser.cpp

 /*
  * Copyright (C) 2000 Peter Kelly (pmk@post.com)
  * Copyright (C) 2005, 2006, 2008, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 16 matching lines @@
 #include "core/xml/parser/XMLDocumentParser.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8Document.h"
 #include "core/FetchInitiatorTypeNames.h"
 #include "core/HTMLNames.h"
 #include "core/XMLNSNames.h"
-#include "core/dom/CDATASection.h"
 #include "core/dom/Comment.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentFragment.h"
 #include "core/dom/DocumentType.h"
 #include "core/dom/ProcessingInstruction.h"
 #include "core/dom/ScriptLoader.h"
+#include "core/dom/Text.h"
 #include "core/dom/TransformSource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ScriptResource.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLHtmlElement.h"
 #include "core/html/HTMLTemplateElement.h"
 #include "core/html/parser/HTMLEntityParser.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/loader/FrameLoader.h"
@@ skipping 161 matching lines @@
     virtual void call(XMLDocumentParser* parser) override
     {
         parser->processingInstruction(m_target, m_data);
     }
 
 private:
     String m_target;
     String m_data;
 };
 
-class PendingCDATABlockCallback final : public XMLDocumentParser::PendingCallback {
-public:
-    explicit PendingCDATABlockCallback(const String& text) : m_text(text) { }
-
-    virtual void call(XMLDocumentParser* parser) override
-    {
-        parser->cdataBlock(m_text);
-    }
-
-private:
-    String m_text;
-};
-
 class PendingCommentCallback final : public XMLDocumentParser::PendingCallback {
 public:
     explicit PendingCommentCallback(const String& text) : m_text(text) { }
 
     virtual void call(XMLDocumentParser* parser) override
     {
         parser->comment(m_text);
     }
 
 private:
@@ skipping 921 matching lines @@
         // This behavior is very tricky. We call stopParsing() here because we
         // want to stop processing the document until we're ready to apply the
         // transform, but we actually still want to be fed decoded string pieces
         // to accumulate in m_originalSourceForTransform. So, we call
         // stopParsing() here and check isStopped() in element callbacks.
         // FIXME: This contradicts the contract of DocumentParser.
         stopParsing();
     }
 }
 
-void XMLDocumentParser::cdataBlock(const String& text)
-{
-    if (isStopped())
-        return;
-
-    if (m_parserPaused) {
-        m_pendingCallbacks.append(adoptPtr(new PendingCDATABlockCallback(text)));
-        return;
-    }
-
-    exitText();
-
-    m_currentNode->parserAppendChild(CDATASection::create(m_currentNode->document(), text));
-}
-
 void XMLDocumentParser::comment(const String& text)
 {
     if (isStopped())
         return;
 
     if (m_parserPaused) {
         m_pendingCallbacks.append(adoptPtr(new PendingCommentCallback(text)));
         return;
     }
 
@@ skipping 64 matching lines @@
 static void charactersHandler(void* closure, const xmlChar* chars, int length)
 {
     getParser(closure)->characters(chars, length);
 }
 
 static void processingInstructionHandler(void* closure, const xmlChar* target, const xmlChar* data)
 {
     getParser(closure)->processingInstruction(toString(target), toString(data));
 }
 
-static void cdataBlockHandler(void* closure, const xmlChar* text, int length)
-{
-    getParser(closure)->cdataBlock(toString(text, length));
-}
-
 static void commentHandler(void* closure, const xmlChar* text)
 {
     getParser(closure)->comment(toString(text));
 }
 
 WTF_ATTRIBUTE_PRINTF(2, 3)
 static void warningHandler(void* closure, const char* message, ...)
 {
     va_list args;
     va_start(args, message);
@@ skipping 131 matching lines @@
     memset(&sax, 0, sizeof(sax));
 
     // According to http://xmlsoft.org/html/libxml-tree.html#xmlSAXHandler and
     // http://xmlsoft.org/html/libxml-parser.html#fatalErrorSAXFunc the SAX
     // fatalError callback is unused; error gets all the errors. Use normalErrorHandler
     // for both the error and fatalError callbacks.
     sax.error = normalErrorHandler;
     sax.fatalError = normalErrorHandler;
     sax.characters = charactersHandler;
     sax.processingInstruction = processingInstructionHandler;
-    sax.cdataBlock = cdataBlockHandler;
+    sax.cdataBlock = charactersHandler;
     sax.comment = commentHandler;
     sax.warning = warningHandler;
     sax.startElementNs = startElementNsHandler;
     sax.endElementNs = endElementNsHandler;
     sax.getEntity = getEntityHandler;
     sax.startDocument = startDocumentHandler;
     sax.endDocument = endDocumentHandler;
     sax.internalSubset = internalSubsetHandler;
     sax.externalSubset = externalSubsetHandler;
     sax.ignorableWhitespace = ignorableWhitespaceHandler;
@@ skipping 194 matching lines @@
     sax.initialized = XML_SAX2_MAGIC;
     RefPtr<XMLParserContext> parser = XMLParserContext::createStringParser(&sax, &state);
     String parseString = "<?xml version=\"1.0\"?><attrs " + string + " />";
     parseChunk(parser->context(), parseString);
     finishParsing(parser->context());
     attrsOK = state.gotAttributes;
     return state.attributes;
 }
 
 } // namespace blink