Bug 1433563 - Remove nsIDOMCDATASection; r=qdot

dom/base/nsDocument.cpp

@@ -6086,11 +6086,13 @@ nsIDocument::CreateComment(const nsAString& aData) const
 
 NS_IMETHODIMP
 nsDocument::CreateCDATASection(const nsAString& aData,
-                               nsIDOMCDATASection** aReturn)
+                               nsISupports** aReturn)
 {
   NS_ENSURE_ARG_POINTER(aReturn);
   ErrorResult rv;
-  *aReturn = nsIDocument::CreateCDATASection(aData, rv).take();
+  already_AddRefed<CDATASection> supports =
+    nsIDocument::CreateCDATASection(aData, rv);
+  *aReturn = ToSupports(supports.take());
   return rv.StealNSResult();
 }
 

dom/base/nsDocumentEncoder.cpp

@@ -22,7 +22,6 @@
 #include "nsIOutputStream.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMText.h"
-#include "nsIDOMCDATASection.h"
 #include "nsIDOMComment.h"
 #include "nsIDOMProcessingInstruction.h"
 #include "nsIDOMDocumentType.h"

dom/base/nsGenericDOMDataNode.cpp

@@ -6,7 +6,7 @@
 
 /*
  * Base class for DOM Core's nsIDOMComment, nsIDOMDocumentType, nsIDOMText,
- * nsIDOMCDATASection, and nsIDOMProcessingInstruction nodes.
+ * CDATASection and nsIDOMProcessingInstruction nodes.
  */
 
 #include "mozilla/DebugOnly.h"

dom/base/nsGenericDOMDataNode.h

@@ -6,7 +6,7 @@
 
 /*
  * Base class for DOM Core's nsIDOMComment, nsIDOMDocumentType, nsIDOMText,
- * nsIDOMCDATASection, and nsIDOMProcessingInstruction nodes.
+ * CDATASection, and nsIDOMProcessingInstruction nodes.
  */
 
 #ifndef nsGenericDOMDataNode_h___

dom/base/test/test_bug352728.xhtml

@@ -94,7 +94,7 @@ function testCDATASection(aText, aShouldSucceed)
     var types = [ CDATASection, CharacterData, Node ];
     checkTypes(cdataSection, "CDATA section", types);
 
-    var interfaces = [ "nsIDOMCDATASection", "nsIDOMCharacterData",
+    var interfaces = [ "nsIDOMCharacterData",
                        "nsIDOMNode", "nsIDOMEventTarget" ];
     checkInterfaces(cdataSection, "CDATA section", interfaces);
 

dom/interfaces/base/domstubs.idl

@@ -16,7 +16,6 @@ typedef double DOMHighResTimeStamp;
 typedef unsigned long long nsViewID;
 
 // Core
-interface nsIDOMCDATASection;
 interface nsIDOMCharacterData;
 interface nsIDOMComment;
 interface nsIDOMDOMImplementation;

dom/interfaces/core/moz.build

@@ -8,7 +8,6 @@ with Files("**"):
     BUG_COMPONENT = ("Core", "DOM")
 
 XPIDL_SOURCES += [
-    'nsIDOMCDATASection.idl',
     'nsIDOMCharacterData.idl',
     'nsIDOMComment.idl',
     'nsIDOMDocument.idl',

dom/interfaces/core/nsIDOMCDATASection.idl

@@ -1,21 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIDOMText.idl"
-
-/**
- * CDATA sections are used to escape blocks of text containing characters 
- * that would otherwise be regarded as markup.
- * Their primary purpose is for including material such as XML fragments, 
- * without needing to escape all the delimiters.
- * 
- * For more information on this interface please see 
- * http://www.w3.org/TR/DOM-Level-2-Core/
- */
-
-[uuid(e14ef131-34cc-40c8-9c99-a403c001184a)]
-interface nsIDOMCDATASection : nsIDOMText
-{
-};

dom/interfaces/core/nsIDOMDocument.idl

@@ -43,7 +43,7 @@ interface nsIDOMDocument : nsIDOMNode
   nsIDOMDocumentFragment        createDocumentFragment();
   nsIDOMText                    createTextNode(in DOMString data);
   nsIDOMComment                 createComment(in DOMString data);
-  nsIDOMCDATASection            createCDATASection(in DOMString data)
+  nsISupports                   createCDATASection(in DOMString data)
                                   raises(DOMException);
   nsIDOMProcessingInstruction   createProcessingInstruction(in DOMString target, 
                                                             in DOMString data)

dom/xml/CDATASection.cpp

@@ -16,8 +16,7 @@ CDATASection::~CDATASection()
 }
 
 NS_IMPL_ISUPPORTS_INHERITED(CDATASection, nsGenericDOMDataNode, nsIDOMNode,
-                            nsIDOMCharacterData, nsIDOMText,
-                            nsIDOMCDATASection)
+                            nsIDOMCharacterData, nsIDOMText)
 
 JSObject*
 CDATASection::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)

dom/xml/CDATASection.h

@@ -8,14 +8,13 @@
 #define mozilla_dom_CDATASection_h
 
 #include "mozilla/Attributes.h"
-#include "nsIDOMCDATASection.h"
 #include "mozilla/dom/Text.h"
 
 namespace mozilla {
 namespace dom {
 
 class CDATASection final : public Text,
-                           public nsIDOMCDATASection
+                           public nsIDOMText
 {
 private:
   void Init()
@@ -54,9 +53,6 @@ public:
   // nsIDOMText
   NS_FORWARD_NSIDOMTEXT(nsGenericDOMDataNode::)
 
-  // nsIDOMCDATASection
-  // Empty interface
-
   // nsINode
   virtual bool IsNodeOfType(uint32_t aFlags) const override;
 

dom/xml/nsXMLContentSink.cpp

@@ -16,7 +16,6 @@
 #include "nsIDocShell.h"
 #include "nsIStyleSheetLinkingElement.h"
 #include "nsIDOMComment.h"
-#include "nsIDOMCDATASection.h"
 #include "DocumentType.h"
 #include "nsHTMLParts.h"
 #include "nsCRT.h"

xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp

@@ -11,7 +11,6 @@
 #include "nsIDOMAnimationEvent.h"
 #include "nsIDOMBeforeUnloadEvent.h"
 #include "nsIDOMCanvasRenderingContext2D.h"
-#include "nsIDOMCDATASection.h"
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMClientRect.h"
 #include "nsIDOMClientRectList.h"
@@ -90,7 +89,6 @@
 #include "mozilla/dom/AnimationEventBinding.h"
 #include "mozilla/dom/BeforeUnloadEventBinding.h"
 #include "mozilla/dom/CanvasRenderingContext2DBinding.h"
-#include "mozilla/dom/CDATASectionBinding.h"
 #include "mozilla/dom/CharacterDataBinding.h"
 #include "mozilla/dom/DOMRectBinding.h"
 #include "mozilla/dom/DOMRectListBinding.h"
@@ -241,7 +239,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
   DEFINE_SHIM(AnimationEvent),
   DEFINE_SHIM(BeforeUnloadEvent),
   DEFINE_SHIM(CanvasRenderingContext2D),
-  DEFINE_SHIM(CDATASection),
   DEFINE_SHIM(CharacterData),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRect, DOMRectReadOnly),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRectList, DOMRectList),