Backed out 2 changesets (bug 1461742) for build bustage on CustomElementRegistry.cpp:97. CLOSED TREE

Backed out changeset ca5415dbc51a (bug 1461742)
Backed out changeset 30bd77de7bf5 (bug 1461742)

dom/base/CustomElementRegistry.cpp

@@ -14,7 +14,6 @@
 #include "mozilla/dom/DocGroup.h"
 #include "nsHTMLTags.h"
 #include "jsapi.h"
-#include "xpcprivate.h"
 #include "nsGlobalWindow.h"
 
 namespace mozilla {
@@ -93,9 +92,6 @@ CustomElementCallback::Call()
       static_cast<LifecycleAttributeChangedCallback *>(mCallback.get())->Call(mThisObject,
         mArgs.name, mArgs.oldValue, mArgs.newValue, mArgs.namespaceURI);
       break;
-    case nsIDocument::eGetCustomInterface:
-      NS_NOTREACHED("Don't call GetCustomInterface through callback");
-      break;
   }
 }
 
@@ -479,10 +475,6 @@ CustomElementRegistry::CreateCustomElementCallback(
         func = aDefinition->mCallbacks->mAttributeChangedCallback.Value();
       }
       break;
-
-    case nsIDocument::eGetCustomInterface:
-      NS_NOTREACHED("Don't call GetCustomInterface through callback");
-      break;
   }
 
   // If there is no such callback, stop.
@@ -839,8 +831,7 @@ CustomElementRegistry::Define(JSContext* aCx,
      * 10.3. Let lifecycleCallbacks be a map with the four keys
      *       "connectedCallback", "disconnectedCallback", "adoptedCallback", and
      *       "attributeChangedCallback", each of which belongs to an entry whose
-     *       value is null. The 'getCustomInterface' callback is also included
-     *       for chrome usage.
+     *       value is null.
      * 10.4. For each of the four keys callbackName in lifecycleCallbacks:
      *       1. Let callbackValue be Get(prototype, callbackName). Rethrow any
      *          exceptions.
@@ -1170,51 +1161,6 @@ CustomElementRegistry::Upgrade(Element* aElement,
   aElement->SetCustomElementDefinition(aDefinition);
 }
 
-already_AddRefed<nsISupports>
-CustomElementRegistry::CallGetCustomInterface(Element* aElement,
-                                              const nsIID& aIID)
-{
-  MOZ_ASSERT(aElement);
-
-  if (nsContentUtils::IsChromeDoc(aElement->OwnerDoc())) {
-    CustomElementDefinition* definition = aElement->GetCustomElementDefinition();
-    if (definition && definition->mCallbacks &&
-        definition->mCallbacks->mGetCustomInterfaceCallback.WasPassed() &&
-        definition->mLocalName == aElement->NodeInfo()->NameAtom()) {
-
-      LifecycleGetCustomInterfaceCallback* func =
-        definition->mCallbacks->mGetCustomInterfaceCallback.Value();
-      JS::Rooted<JSObject*> customInterface(RootingCx());
-
-      nsCOMPtr<nsIJSID> iid = nsJSID::NewID(aIID);
-      func->Call(aElement, iid, &customInterface);
-      if (customInterface) {
-        RefPtr<nsXPCWrappedJS> wrappedJS;
-        nsresult rv =
-          nsXPCWrappedJS::GetNewOrUsed(customInterface,
-                                       NS_GET_IID(nsISupports),
-                                       getter_AddRefs(wrappedJS)); 
-        if (NS_SUCCEEDED(rv) && wrappedJS) {
-          // Check if the returned object implements the desired interface. 
-          nsCOMPtr<nsISupports> retval;
-          if (NS_SUCCEEDED(wrappedJS->QueryInterface(aIID,
-                                                     getter_AddRefs(retval)))) {        
-            return retval.forget();
-          }
-        }
-      }
-    }
-  }
-
-  // Otherwise, check if the element supports the interface directly, and just use that.
-  nsCOMPtr<nsISupports> supports;
-  if (NS_SUCCEEDED(aElement->QueryInterface(aIID, getter_AddRefs(supports)))) {
-    return supports.forget();
-  }
-
-  return nullptr;
-}
-
 //-----------------------------------------------------
 // CustomElementReactionsStack
 
@@ -1426,11 +1372,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(CustomElementDefinition)
     cb.NoteXPCOMChild(callbacks->mAdoptedCallback.Value());
   }
 
-  if (callbacks->mGetCustomInterfaceCallback.WasPassed()) {
-    NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mCallbacks->mGetCustomInterfaceCallback");
-    cb.NoteXPCOMChild(callbacks->mGetCustomInterfaceCallback.Value());
-  }
-
   NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mConstructor");
   cb.NoteXPCOMChild(tmp->mConstructor);
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END

dom/base/CustomElementRegistry.h

@@ -416,20 +416,6 @@ public:
    */
   static void Upgrade(Element* aElement, CustomElementDefinition* aDefinition, ErrorResult& aRv);
 
-  /**
-   * To allow native code to call methods of chrome-implemented custom elements,
-   * a helper method may be defined in the custom element called
-   * 'getCustomInterfaceCallback'. This method takes an IID and returns an
-   * object which implements an XPCOM interface. If there is no
-   * getCustomInterfaceCallback or the callback doesn't return an object,
-   * QueryInterface is called on aElement to see if this interface is
-   * implemented directly.
-   *
-   * This returns null if aElement is not from a chrome document.
-   */
-  static already_AddRefed<nsISupports> CallGetCustomInterface(
-    Element* aElement, const nsIID& aIID);
-
   /**
    * Registers an unresolved custom element that is a candidate for
    * upgrade. |aTypeName| is the name of the custom element type, if it is not

dom/base/Element.cpp

@@ -4304,16 +4304,6 @@ Element::UpdateIntersectionObservation(DOMIntersectionObserver* aObserver, int32
   return updated;
 }
 
-template<class T> void
-Element::GetCustomInterface(nsGetterAddRefs<T> aResult)
-{
-  nsCOMPtr<nsISupports> iface =
-    CustomElementRegistry::CallGetCustomInterface(this, NS_GET_TEMPLATE_IID(T));
-  if (iface) {
-    CallQueryInterface(iface, static_cast<T**>(aResult));
-  }
-}
-
 void
 Element::ClearServoData(nsIDocument* aDoc) {
   MOZ_ASSERT(aDoc);

dom/base/Element.h

@@ -1987,14 +1987,6 @@ private:
    */
   MOZ_CAN_RUN_SCRIPT nsRect GetClientAreaRect();
 
-  /**
-   * GetCustomInterface is somewhat like a GetInterface, but it is expected
-   * that the implementation is provided by a custom element or via the 
-   * the XBL implements keyword. To use this, create a public method that
-   * wraps a call to GetCustomInterface.
-   */
-  template<class T> void GetCustomInterface(nsGetterAddRefs<T> aResult);
-
   // Prevent people from doing pointless checks/casts on Element instances.
   void IsElement() = delete;
   void AsElement() = delete;

dom/base/nsIDocument.h

@@ -3083,8 +3083,7 @@ public:
     eConnected,
     eDisconnected,
     eAdopted,
-    eAttributeChanged,
-    eGetCustomInterface
+    eAttributeChanged
   };
 
   nsIDocument* GetTopLevelContentDocument();

dom/webidl/WebComponents.webidl

@@ -10,8 +10,6 @@
  * liability, trademark and document use rules apply.
  */
 
-interface IID;
-
 callback LifecycleConnectedCallback = void();
 callback LifecycleDisconnectedCallback = void();
 callback LifecycleAdoptedCallback = void(Document? oldDocument,
@@ -20,12 +18,10 @@ callback LifecycleAttributeChangedCallback = void(DOMString attrName,
                                                   DOMString? oldValue,
                                                   DOMString? newValue,
                                                   DOMString? namespaceURI);
-callback LifecycleGetCustomInterfaceCallback = object?(IID iid);
 
 dictionary LifecycleCallbacks {
   LifecycleConnectedCallback connectedCallback;
   LifecycleDisconnectedCallback disconnectedCallback;
   LifecycleAdoptedCallback adoptedCallback;
   LifecycleAttributeChangedCallback attributeChangedCallback;
-  [ChromeOnly] LifecycleGetCustomInterfaceCallback getCustomInterfaceCallback;
 };

toolkit/content/customElements.js

@@ -2,8 +2,6 @@
  * 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/. */
 
-/* globals MozQueryInterface */
-
 "use strict";
 
 // This is loaded into all XUL windows. Wrap in a block to prevent
@@ -61,54 +59,6 @@ class MozXULElement extends XULElement {
     range.selectNodeContents(doc.querySelector("box"));
     return range.extractContents();
   }
-
-  /**
-   * Indicate that a class defining an element implements one or more
-   * XPCOM interfaces. The custom element getCustomInterface is added
-   * as well as an implementation of QueryInterface.
-   *
-   * The supplied class should implement the properties and methods of
-   * all of the interfaces that are specified.
-   *
-   * @param cls
-   *        The class that implements the interface.
-   * @param names
-   *        Array of interface names
-   */
-  static implementCustomInterface(cls, ifaces) {
-    cls.prototype.QueryInterface = ChromeUtils.generateQI(ifaces);
-    cls.prototype.getCustomInterfaceCallback = function getCustomInterfaceCallback(iface) {
-      if (ifaces.includes(Ci[Components.interfacesByID[iface.number]])) {
-        return getInterfaceProxy(this);
-      }
-      return null;
-    };
-  }
-}
-
-/**
- * Given an object, add a proxy that reflects interface implementations
- * onto the object itself.
- */
-function getInterfaceProxy(obj) {
-  if (!obj._customInterfaceProxy) {
-    obj._customInterfaceProxy = new Proxy(obj, {
-      get(target, prop, receiver) {
-        let propOrMethod = target[prop];
-        if (typeof propOrMethod == "function") {
-          if (propOrMethod instanceof MozQueryInterface) {
-            return Reflect.get(target, prop, receiver);
-          }
-          return function(...args) {
-            return propOrMethod.apply(target, args);
-          };
-        }
-        return propOrMethod;
-      }
-    });
-  }
-
-  return obj._customInterfaceProxy;
 }
 
 // Attach the base class to the window so other scripts can use it: