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

Bug 1773770: Part 2 - Migrage KeyValueStore to static component registration. r=asuth 

Differential Revision: https://phabricator.services.mozilla.com/D149430
parent 3b276e74

toolkit/components/build/nsToolkitCompsCID.h

+0 −10
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 


#define NS_FAVICONSERVICE_CONTRACTID "@mozilla.org/browser/favicon-service;1"



#define NS_KEY_VALUE_SERVICE_CONTRACTID "@mozilla.org/key-value-service;1"



/////////////////////////////////////////////////////////////////////////////



// {84E11F80-CA55-11DD-AD8B-0800200C9A66}
@@ -101,11 +99,3 @@ 
      0xb6, 0x05, 0x60, 0xb0, 0x22, 0xa0, 0x07, 0x56 \

    }                                                \

  }
 


// 6cc1a0a8-af97-4d41-9b4a-58dcec46ebce

#define NS_KEY_VALUE_SERVICE_CID                     \

  {                                                  \

    0x6cc1a0a8, 0xaf97, 0x4d41, {                    \

      0x9b, 0x4a, 0x58, 0xdc, 0xec, 0x46, 0xeb, 0xce \

    }                                                \

  }

toolkit/components/kvstore/components.conf

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-

# vim: set filetype=python:

# 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/.



Classes = [

    {

        'cid': '{6cc1a0a8-af97-4d41-9b4a-58dcec46ebce}',

        'contract_ids': ['@mozilla.org/key-value-service;1'],

        'headers': ['/toolkit/components/kvstore/nsKeyValueModule.h'],

        'legacy_constructor': 'nsKeyValueServiceConstructor',

    },

]

toolkit/components/kvstore/moz.build

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ XPIDL_SOURCES += [ 
    "nsIKeyValue.idl",

]



XPIDL_MODULE = "kvstore"



UNIFIED_SOURCES += [

    "nsKeyValueModule.cpp",

XPCOM_MANIFESTS += [

    "components.conf",

]



XPIDL_MODULE = "kvstore"



FINAL_LIBRARY = "xul"

toolkit/components/kvstore/nsKeyValueModule.cpp→toolkit/components/kvstore/nsKeyValueModule.h

+15 −0
Original line number Diff line number Diff line
@@ -2,23 +2,14 @@ 
 * 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 "mozilla/ModuleUtils.h"

#include "nsIClassInfoImpl.h"

#include "nsToolkitCompsCID.h"

#ifndef nsKeyValueModule_h

#define nsKeyValueModule_h



#include "nsID.h"



extern "C" {

// Implemented in Rust.

nsresult nsKeyValueServiceConstructor(REFNSIID aIID, void** aResult);

}  // extern "C"



NS_DEFINE_NAMED_CID(NS_KEY_VALUE_SERVICE_CID);



const mozilla::Module::CIDEntry kKeyValueCIDs[] = {

    {&kNS_KEY_VALUE_SERVICE_CID, false, nullptr, nsKeyValueServiceConstructor},

    {nullptr}};



const mozilla::Module::ContractIDEntry kKeyValueContracts[] = {

    {NS_KEY_VALUE_SERVICE_CONTRACTID, &kNS_KEY_VALUE_SERVICE_CID}, {nullptr}};



extern const mozilla::Module kKeyValueModule = {

    mozilla::Module::kVersion, kKeyValueCIDs, kKeyValueContracts, nullptr};
 
#endif  // defined nsKeyValueModule_h

xpcom/components/nsComponentManager.cpp

+0 −2
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ extern const mozilla::Module kContentProcessWidgetModule; 
#if defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_UIKIT)

extern const mozilla::Module kWidgetModule;

#endif

extern const mozilla::Module kKeyValueModule;

extern const mozilla::Module kXREModule;



static nsTArray<const mozilla::Module*>* sExtraStaticModules;
@@ -370,7 +369,6 @@ nsresult nsComponentManagerImpl::Init() { 
#if defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_UIKIT)

  RegisterModule(&kWidgetModule);

#endif

  RegisterModule(&kKeyValueModule);

  RegisterModule(&kXREModule);



  for (uint32_t i = 0; i < sExtraStaticModules->Length(); ++i) {