Commit dbb75391 authored by Kris Maglione's avatar Kris Maglione
Browse files

Bug 1773770: Part 10 - Migrate xpcshell to register components without defining a module. r=mccr8 

Differential Revision: https://phabricator.services.mozilla.com/D149437
parent fe9734c5

js/xpconnect/src/XPCShellImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static bool RegisterXPCTestComponents(JSContext* cx, unsigned argc, Value* vp) { 
    JS_ReportErrorASCII(cx, "Wrong number of arguments");

    return false;

  }

  nsresult rv = XRE_AddStaticComponent(&kXPCTestModule);

  nsresult rv = xpcTestRegisterComponents();

  if (NS_FAILED(rv)) {

    XPCThrower::Throw(rv, cx);

    return false;

js/xpconnect/tests/components/native/moz.build

+4 −0
Original line number Diff line number Diff line
@@ -16,4 +16,8 @@ UNIFIED_SOURCES += [ 
    "xpctest_returncode.cpp",

]



LOCAL_INCLUDES += [

    "/xpcom/components",

]



FINAL_LIBRARY = "xul"

js/xpconnect/tests/components/native/xpctest_module.cpp

+33 −70
Original line number Diff line number Diff line
@@ -6,75 +6,38 @@ 


/* module registration and factory code. */



#include "mozilla/GenericFactory.h"

#include "mozilla/ResultExtensions.h"

#include "nsComponentManager.h"

#include "xpctest_private.h"



#define NS_XPCTESTOBJECTREADONLY_CID                 \

  {                                                  \

    0x492609a7, 0x2582, 0x436b, {                    \

      0xb0, 0xef, 0x92, 0xe2, 0x9b, 0xb9, 0xe1, 0x43 \

    }                                                \

  }

template <typename T>

nsresult RegisterFactory(const char* aContractID) {

  auto constructor = [](REFNSIID aIID, void** aResult) {

    RefPtr inst = new T();

    return inst->QueryInterface(aIID, aResult);

  };



#define NS_XPCTESTOBJECTREADWRITE_CID                \

  {                                                  \

    0x8f37f760, 0x3686, 0x4dbb, {                    \

      0xb1, 0x21, 0x96, 0x93, 0xba, 0x81, 0x3f, 0x8f \

    }                                                \

  }

  nsCOMPtr<nsIFactory> factory = new mozilla::GenericFactory(constructor);



#define NS_XPCTESTPARAMS_CID                         \

  {                                                  \

    0x1f11076a, 0x0fa2, 0x4f07, {                    \

      0xb4, 0x7a, 0xa1, 0x54, 0x31, 0xf2, 0xce, 0xf7 \

    }                                                \

  }

  nsID cid;

  MOZ_TRY(nsID::GenerateUUIDInPlace(cid));



#define NS_XPCTESTRETURNCODEPARENT_CID               \

  {                                                  \

    0x3818f744, 0x5445, 0x4e9c, {                    \

      0x9b, 0xb8, 0x64, 0x62, 0xfe, 0x81, 0xb6, 0x19 \

    }                                                \

  return nsComponentManagerImpl::gComponentManager->RegisterFactory(

      cid, aContractID, aContractID, factory);

}



#define NS_XPCTESTCENUMS_CID                         \

  {                                                  \

    0x89ba673a, 0xa987, 0xb89c, {                    \

      0x92, 0x02, 0xb9, 0xc6, 0x23, 0x38, 0x64, 0x55 \

    }                                                \

nsresult xpcTestRegisterComponents() {

  MOZ_TRY(RegisterFactory<xpcTestObjectReadOnly>(

      "@mozilla.org/js/xpc/test/native/ObjectReadOnly;1"));

  MOZ_TRY(RegisterFactory<xpcTestObjectReadWrite>(

      "@mozilla.org/js/xpc/test/native/ObjectReadWrite;1"));

  MOZ_TRY(RegisterFactory<nsXPCTestParams>(

      "@mozilla.org/js/xpc/test/native/Params;1"));

  MOZ_TRY(RegisterFactory<nsXPCTestReturnCodeParent>(

      "@mozilla.org/js/xpc/test/native/ReturnCodeParent;1"));

  MOZ_TRY(RegisterFactory<xpcTestCEnums>(

      "@mozilla.org/js/xpc/test/native/CEnums;1"));



  return NS_OK;

}
 


NS_GENERIC_FACTORY_CONSTRUCTOR(xpcTestCEnums)

NS_GENERIC_FACTORY_CONSTRUCTOR(xpcTestObjectReadOnly)

NS_GENERIC_FACTORY_CONSTRUCTOR(xpcTestObjectReadWrite)

NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCTestParams)

NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCTestReturnCodeParent)

NS_DEFINE_NAMED_CID(NS_XPCTESTOBJECTREADONLY_CID);

NS_DEFINE_NAMED_CID(NS_XPCTESTOBJECTREADWRITE_CID);

NS_DEFINE_NAMED_CID(NS_XPCTESTPARAMS_CID);

NS_DEFINE_NAMED_CID(NS_XPCTESTRETURNCODEPARENT_CID);

NS_DEFINE_NAMED_CID(NS_XPCTESTCENUMS_CID);



static const mozilla::Module::CIDEntry kXPCTestCIDs[] = {

    {&kNS_XPCTESTOBJECTREADONLY_CID, false, nullptr,

     xpcTestObjectReadOnlyConstructor},

    {&kNS_XPCTESTOBJECTREADWRITE_CID, false, nullptr,

     xpcTestObjectReadWriteConstructor},

    {&kNS_XPCTESTPARAMS_CID, false, nullptr, nsXPCTestParamsConstructor},

    {&kNS_XPCTESTRETURNCODEPARENT_CID, false, nullptr,

     nsXPCTestReturnCodeParentConstructor},

    {&kNS_XPCTESTCENUMS_CID, false, nullptr, xpcTestCEnumsConstructor},

    {nullptr}};



static const mozilla::Module::ContractIDEntry kXPCTestContracts[] = {

    {"@mozilla.org/js/xpc/test/native/CEnums;1", &kNS_XPCTESTCENUMS_CID},

    {"@mozilla.org/js/xpc/test/native/ObjectReadOnly;1",

     &kNS_XPCTESTOBJECTREADONLY_CID},

    {"@mozilla.org/js/xpc/test/native/ObjectReadWrite;1",

     &kNS_XPCTESTOBJECTREADWRITE_CID},

    {"@mozilla.org/js/xpc/test/native/Params;1", &kNS_XPCTESTPARAMS_CID},

    {"@mozilla.org/js/xpc/test/native/ReturnCodeParent;1",

     &kNS_XPCTESTRETURNCODEPARENT_CID},

    {nullptr}};



const mozilla::Module kXPCTestModule = {mozilla::Module::kVersion, kXPCTestCIDs,

                                        kXPCTestContracts};

js/xpconnect/tests/components/native/xpctest_private.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "mozilla/Attributes.h"

#include "mozilla/ModuleUtils.h"



extern const mozilla::Module kXPCTestModule;

nsresult xpcTestRegisterComponents();



class xpcTestObjectReadOnly final : public nsIXPCTestObjectReadOnly {

 public: