Revert "Bug 1279218 - Additional applet tag logic removal; r=bz"

This reverts commit d812ac4.

accessible/html/HTMLTableAccessible.cpp

@@ -1109,8 +1109,9 @@ HTMLTableAccessible::IsProbablyLayoutTable()
 
   if (HasDescendant(NS_LITERAL_STRING("embed")) ||
       HasDescendant(NS_LITERAL_STRING("object")) ||
+      HasDescendant(NS_LITERAL_STRING("applet")) ||
       HasDescendant(NS_LITERAL_STRING("iframe"))) {
-    RETURN_LAYOUT_ANSWER(true, "Has no borders, and has iframe, object, or iframe, typical of advertisements");
+    RETURN_LAYOUT_ANSWER(true, "Has no borders, and has iframe, object, applet or iframe, typical of advertisements");
   }
 
   RETURN_LAYOUT_ANSWER(false, "no layout factor strong enough, so will guess data");

dom/base/Element.cpp

@@ -489,10 +489,11 @@ Element::GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult)
   // If we have a frame the frame has already loaded the binding.  And
   // otherwise, don't do anything else here unless we're dealing with
   // XUL or an HTML element that may have a plugin-related overlay
-  // (i.e. object or embed).
+  // (i.e. object, embed, or applet).
   bool isXULorPluginElement = (IsXULElement() ||
                                IsHTMLElement(nsGkAtoms::object) ||
-                               IsHTMLElement(nsGkAtoms::embed));
+                               IsHTMLElement(nsGkAtoms::embed) ||
+                               IsHTMLElement(nsGkAtoms::applet));
   nsIPresShell* shell = aDocument->GetShell();
   if (!shell || GetPrimaryFrame() || !isXULorPluginElement) {
     *aResult = nullptr;

dom/base/nsContentList.cpp

@@ -152,67 +152,6 @@ nsSimpleContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto
   return NodeListBinding::Wrap(cx, this, aGivenProto);
 }
 
-NS_IMPL_CYCLE_COLLECTION_INHERITED(nsEmptyContentList, nsBaseContentList, mRoot)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsEmptyContentList)
-NS_INTERFACE_MAP_END_INHERITING(nsBaseContentList)
-
-
-NS_IMPL_ADDREF_INHERITED(nsEmptyContentList, nsBaseContentList)
-NS_IMPL_RELEASE_INHERITED(nsEmptyContentList, nsBaseContentList)
-
-JSObject*
-nsEmptyContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
-{
-  return NodeListBinding::Wrap(cx, this, aGivenProto);
-}
-
-NS_IMETHODIMP
-nsEmptyContentList::GetLength(uint32_t* aLength)
-{
-  *aLength = 0;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEmptyContentList::Item(uint32_t aIndex, nsIDOMNode** aReturn)
-{
-  *aReturn = nullptr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEmptyContentList::NamedItem(const nsAString& aName, nsIDOMNode** aReturn)
-{
-  *aReturn = nullptr;
-  return NS_OK;
-}
-
-mozilla::dom::Element*
-nsEmptyContentList::GetElementAt(uint32_t index)
-{
-  return nullptr;
-}
-
-mozilla::dom::Element*
-nsEmptyContentList::GetFirstNamedElement(const nsAString& aName, bool& aFound)
-{
-  aFound = false;
-  return nullptr;
-}
-
-void
-nsEmptyContentList::GetSupportedNames(nsTArray<nsString>& aNames)
-{
-}
-
-nsIContent*
-nsEmptyContentList::Item(uint32_t aIndex)
-{
-  return nullptr;
-}
-
 // Hashtable for storing nsContentLists
 static PLDHashTable* gContentListHashTable;
 

dom/base/nsContentList.h

@@ -139,52 +139,6 @@ class nsSimpleContentList : public nsBaseContentList
   nsCOMPtr<nsINode> mRoot;
 };
 
-// Used for returning lists that will always be empty, such as the applets list
-// in HTML Documents
-class nsEmptyContentList: public nsBaseContentList,
-                          public nsIHTMLCollection
-{
-public:
-  explicit nsEmptyContentList(nsINode* aRoot) : nsBaseContentList(),
-                                                mRoot(aRoot)
-  {
-  }
-
-  // nsIDOMHTMLCollection
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsEmptyContentList,
-                                           nsBaseContentList)
-  NS_DECL_NSIDOMHTMLCOLLECTION
-
-  virtual nsINode* GetParentObject() override
-  {
-    return mRoot;
-  }
-
-  virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override;
-
-  virtual JSObject* GetWrapperPreserveColorInternal() override
-  {
-    return nsWrapperCache::GetWrapperPreserveColor();
-  }
-  virtual void PreserveWrapperInternal(nsISupports* aScriptObjectHolder) override
-  {
-    nsWrapperCache::PreserveWrapper(aScriptObjectHolder);
-  }
-
-  virtual nsIContent* Item(uint32_t aIndex) override;
-  virtual mozilla::dom::Element* GetElementAt(uint32_t index) override;
-  virtual mozilla::dom::Element*
-  GetFirstNamedElement(const nsAString& aName, bool& aFound) override;
-  virtual void GetSupportedNames(nsTArray<nsString>& aNames) override;
-
-protected:
-  virtual ~nsEmptyContentList() {}
-private:
-  // This has to be a strong reference, the root might go away before the list.
-  nsCOMPtr<nsINode> mRoot;
-};
-
 /**
  * Class that's used as the key to hash nsContentList implementations
  * for fast retrieval

dom/base/nsHTMLContentSerializer.cpp

@@ -118,9 +118,10 @@ nsHTMLContentSerializer::SerializeHTMLAttributes(nsIContent* aContent,
          (attrName == nsGkAtoms::src && namespaceID == kNameSpaceID_None))) {
       // Make all links absolute when converting only the selection:
       if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) {
-        // Would be nice to handle OBJECT tags, but that gets more complicated
-        // since we have to search the tag list for CODEBASE as well. For now,
-        // just leave them relative.
+        // Would be nice to handle OBJECT and APPLET tags,
+        // but that gets more complicated since we have to
+        // search the tag list for CODEBASE as well.
+        // For now, just leave them relative.
         nsCOMPtr<nsIURI> uri = aContent->GetBaseURI();
         if (uri) {
           nsAutoString absURI;

dom/base/nsIContent.h

@@ -822,10 +822,10 @@ class nsIContent : public nsINode {
    * This method is called when the parser finishes creating the element's children,
    * if any are present.
    *
-   * NOTE: this is currently only called for textarea, select, and object
-   * elements in the HTML content sink. If you want to call it on your element,
-   * modify the content sink of your choice to do so. This is an efficiency
-   * measure.
+   * NOTE: this is currently only called for textarea, select, applet, and
+   * object elements in the HTML content sink.  If you want
+   * to call it on your element, modify the content sink of your
+   * choice to do so.  This is an efficiency measure.
    *
    * If you also need to determine whether the parser is the one creating your
    * element (through createElement() or cloneNode() generally) then add a
@@ -842,14 +842,12 @@ class nsIContent : public nsINode {
   }
 
   /**
-   * For HTML textarea, select, and object elements, returns true if all
-   * children have been added OR if the element was not created by the parser.
-   * Returns true for all other elements.
-   *
+   * For HTML textarea, select, applet, and object elements, returns
+   * true if all children have been added OR if the element was not
+   * created by the parser. Returns true for all other elements.
    * @returns false if the element was created by the parser and
-   *                   it is an HTML textarea, select, or object
+   *                   it is an HTML textarea, select, applet, or object
    *                   element and not all children have been added.
-   *
    * @returns true otherwise.
    */
   virtual bool IsDoneAddingChildren()

dom/base/nsIDocument.h

@@ -3185,10 +3185,9 @@ class nsIDocument : public nsINode,
   // Tracking for images in the document.
   RefPtr<mozilla::dom::ImageTracker> mImageTracker;
 
-  // The set of all object, embed, video/audio elements or
-  // nsIObjectLoadingContent or nsIDocumentActivity for which this is the owner
-  // document. (They might not be in the document.)
-  //
+  // The set of all object, embed, applet, video/audio elements or
+  // nsIObjectLoadingContent or nsIDocumentActivity for which this is the
+  // owner document. (They might not be in the document.)
   // These are non-owning pointers, the elements are responsible for removing
   // themselves when they go away.
   nsAutoPtr<nsTHashtable<nsPtrHashKey<nsISupports> > > mActivityObservers;

dom/base/nsObjectLoadingContent.cpp

@@ -2942,7 +2942,8 @@ nsObjectLoadingContent::LoadFallback(FallbackType aType, bool aNotify) {
   // Do a depth-first traverse of node tree with the current element as root,
   // looking for <embed> or <object> elements that might now need to load.
   nsTArray<nsINodeList*> childNodes;
-  if (thisContent->IsHTMLElement(nsGkAtoms::object) &&
+  if ((thisContent->IsHTMLElement(nsGkAtoms::object) ||
+       thisContent->IsHTMLElement(nsGkAtoms::applet)) &&
       (aType == eFallbackUnsupported ||
        aType == eFallbackDisabled ||
        aType == eFallbackBlocklisted ||
@@ -3773,6 +3774,11 @@ nsObjectLoadingContent::BlockEmbedOrObjectContentLoading()
 {
   nsCOMPtr<nsIContent> thisContent =
     do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
+  if (!thisContent->IsHTMLElement(nsGkAtoms::embed) &&
+      !thisContent->IsHTMLElement(nsGkAtoms::object)) {
+    // Doesn't apply to other elements (i.e. <applet>)
+    return false;
+  }
 
   // Traverse up the node tree to see if we have any ancestors that may block us
   // from loading

dom/base/nsObjectLoadingContent.h

@@ -7,7 +7,7 @@
 /*
  * A base class implementing nsIObjectLoadingContent for use by
  * various content nodes that want to provide plugin/document/image
- * loading functionality (eg <embed>, <object>, etc).
+ * loading functionality (eg <embed>, <object>, <applet>, etc).
  */
 
 #ifndef NSOBJECTLOADINGCONTENT_H_
@@ -262,8 +262,8 @@ class nsObjectLoadingContent : public nsImageLoadingContent
      * Begins loading the object when called
      *
      * Attributes of |this| QI'd to nsIContent will be inspected, depending on
-     * the node type. This function currently assumes it is a <object> or
-     * <embed> tag.
+     * the node type. This function currently assumes it is a <applet>,
+     * <object>, or <embed> tag.
      *
      * The instantiated plugin depends on:
      * - The URI (<embed src>, <object data>)

dom/base/nsSandboxFlags.h

@@ -42,8 +42,9 @@ const unsigned long SANDBOXED_TOPLEVEL_NAVIGATION = 0x4;
 
 /**
  * This flag prevents content from instantiating plugins, whether using the
- * embed element, the object element, or through navigation of a nested browsing
- * context, unless those plugins can be secured.
+ * embed element, the object element, the applet element, or through
+ * navigation of a nested browsing context, unless those plugins can be
+ * secured.
  */
 const unsigned long SANDBOXED_PLUGINS = 0x8;
 

dom/base/nsXHTMLContentSerializer.cpp

@@ -299,7 +299,7 @@ nsXHTMLContentSerializer::SerializeAttributes(nsIContent* aContent,
           (attrName == nsGkAtoms::src))) {
         // Make all links absolute when converting only the selection:
         if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) {
-          // Would be nice to handle OBJECT tags,
+          // Would be nice to handle OBJECT and APPLET tags,
           // but that gets more complicated since we have to
           // search the tag list for CODEBASE as well.
           // For now, just leave them relative.

dom/events/EventStateManager.cpp

@@ -1572,7 +1572,8 @@ EventStateManager::FireContextClick()
         allowedToDispatch = formCtrl->IsTextOrNumberControl(/*aExcludePassword*/ false) ||
                             formCtrl->ControlType() == NS_FORM_INPUT_FILE;
       }
-      else if (mGestureDownContent->IsAnyOfHTMLElements(nsGkAtoms::embed,
+      else if (mGestureDownContent->IsAnyOfHTMLElements(nsGkAtoms::applet,
+                                                        nsGkAtoms::embed,
                                                         nsGkAtoms::object,
                                                         nsGkAtoms::label)) {
         allowedToDispatch = false;

dom/html/HTMLAllCollection.cpp

@@ -70,6 +70,7 @@ static bool
 IsAllNamedElement(nsIContent* aContent)
 {
   return aContent->IsAnyOfHTMLElements(nsGkAtoms::a,
+                                       nsGkAtoms::applet,
                                        nsGkAtoms::button,
                                        nsGkAtoms::embed,
                                        nsGkAtoms::form,

dom/html/HTMLSharedObjectElement.cpp

@@ -388,7 +388,14 @@ HTMLSharedObjectElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenPr
 nsContentPolicyType
 HTMLSharedObjectElement::GetContentPolicyType() const
 {
-  return nsIContentPolicy::TYPE_INTERNAL_EMBED;
+  if (mNodeInfo->Equals(nsGkAtoms::applet)) {
+    // We use TYPE_INTERNAL_OBJECT for applet too, since it is not exposed
+    // through RequestContext yet.
+    return nsIContentPolicy::TYPE_INTERNAL_OBJECT;
+  } else {
+    MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::embed));
+    return nsIContentPolicy::TYPE_INTERNAL_EMBED;
+  }
 }
 
 NS_IMPL_STRING_ATTR(HTMLSharedObjectElement, Align, align)

dom/html/nsGenericHTMLElement.h

@@ -696,6 +696,7 @@ class nsGenericHTMLElement : public nsGenericHTMLElementBase,
   {
     return aTag == nsGkAtoms::img ||
            aTag == nsGkAtoms::form ||
+           aTag == nsGkAtoms::applet ||
            aTag == nsGkAtoms::embed ||
            aTag == nsGkAtoms::object;
   }
@@ -708,7 +709,8 @@ class nsGenericHTMLElement : public nsGenericHTMLElementBase,
   static inline bool
   ShouldExposeIdAsHTMLDocumentProperty(Element* aElement)
   {
-    if (aElement->IsAnyOfHTMLElements(nsGkAtoms::embed,
+    if (aElement->IsAnyOfHTMLElements(nsGkAtoms::applet,
+                                      nsGkAtoms::embed,
                                       nsGkAtoms::object)) {
       return true;
     }

dom/html/nsHTMLDocument.cpp

@@ -1187,7 +1187,7 @@ nsIHTMLCollection*
 nsHTMLDocument::Applets()
 {
   if (!mApplets) {
-    mApplets = new nsEmptyContentList(this);
+    mApplets = new nsContentList(this, kNameSpaceID_XHTML, nsGkAtoms::applet, nsGkAtoms::applet);
   }
   return mApplets;
 }

dom/html/nsHTMLDocument.h

@@ -309,7 +309,7 @@ class nsHTMLDocument : public nsDocument,
   void *GenerateParserKey(void);
 
   RefPtr<nsContentList> mImages;
-  RefPtr<nsEmptyContentList> mApplets;
+  RefPtr<nsContentList> mApplets;
   RefPtr<nsContentList> mEmbeds;
   RefPtr<nsContentList> mLinks;
   RefPtr<nsContentList> mAnchors;

dom/html/test/mochitest.ini

@@ -612,4 +612,3 @@ support-files =
   file_script_module.html
   file_script_nomodule.html
 [test_getElementsByName_after_mutation.html]
-[test_bug1279218.html]

dom/html/test/test_bug579079.html

@@ -22,13 +22,16 @@
 <script class="testbody" type="text/javascript">
 var img = document.img1;
 var form = document.form1;
+var applet = document.applet1;
 var embed = document.embed1;
 var object = document.object1;
 $("foo").innerHTML = $("foo").innerHTML;
 isnot(document.img1, img);
 ok(document.img1 instanceof HTMLImageElement);
 isnot(document.form1, form);
 ok(document.form1 instanceof HTMLFormElement);
+isnot(document.applet1, applet);
+ok(document.applet1 instanceof HTMLUnknownElement);
 isnot(document.embed1, embed);
 ok(document.embed1 instanceof HTMLEmbedElement);
 isnot(document.object1, object);