[mq]: mv-nsGkAtoms-to-xpcom draft
authorNicholas Nethercote <nnethercote@mozilla.com>
Tue, 13 Mar 2018 16:14:30 +1100
changeset 766616 faa72782d0e068610f288aa24d51382a7d9dd6e8
parent 766590 bc35efcddd07531011cc23991dd8ed6a89b259dd
child 766617 12845d45a466b90ac319f0956ef1370017d0b999
push id102371
push usernnethercote@mozilla.com
push dateTue, 13 Mar 2018 06:01:15 +0000
milestone60.0a1
[mq]: mv-nsGkAtoms-to-xpcom MozReview-Commit-ID: 1Y3Fhn9lNbh
dom/base/moz.build
dom/base/nsGkAtomList.h
dom/base/nsGkAtoms.cpp
dom/base/nsGkAtoms.h
xpcom/ds/moz.build
xpcom/ds/nsGkAtomList.h
xpcom/ds/nsGkAtoms.cpp
xpcom/ds/nsGkAtoms.h
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -69,18 +69,16 @@ EXPORTS += [
     'nsDOMClassInfoID.h',
     'nsDOMJSUtils.h',
     'nsDOMNavigationTiming.h',
     'nsDOMString.h',
     'nsDOMTokenList.h',
     'nsFocusManager.h',
     'nsFrameMessageManager.h',
     'nsGenericDOMDataNode.h',
-    'nsGkAtomList.h',
-    'nsGkAtoms.h',
     'nsGlobalWindow.h',  # Because binding headers include it.
     'nsGlobalWindowInner.h',  # Because binding headers include it.
     'nsGlobalWindowOuter.h',  # Because binding headers include it.
     'nsIAnimationObserver.h',
     'nsIAttribute.h',
     'nsIContent.h',
     'nsIContentInlines.h',
     'nsIContentIterator.h',
@@ -294,17 +292,16 @@ UNIFIED_SOURCES += [
     'nsDOMNavigationTiming.cpp',
     'nsDOMSerializer.cpp',
     'nsDOMTokenList.cpp',
     'nsDOMWindowList.cpp',
     'nsFocusManager.cpp',
     'nsFrameLoader.cpp',
     'nsGenConImageContent.cpp',
     'nsGenericDOMDataNode.cpp',
-    'nsGkAtoms.cpp',
     'nsGlobalWindowCommands.cpp',
     'nsHistory.cpp',
     'nsHTMLContentSerializer.cpp',
     'nsIGlobalObject.cpp',
     'nsINode.cpp',
     'nsInProcessTabChildGlobal.cpp',
     'nsJSEnvironment.cpp',
     'nsJSTimeoutHandler.cpp',
--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -48,16 +48,18 @@ EXPORTS += [
     'nsCheapSets.h',
     'nsClassHashtable.h',
     'nsCOMArray.h',
     'nsCRT.h',
     'nsDataHashtable.h',
     'nsDeque.h',
     'nsEnumeratorUtils.h',
     'nsExpirationTracker.h',
+    'nsGkAtomList.h',
+    'nsGkAtoms.h',
     'nsHashKeys.h',
     'nsHashPropertyBag.h',
     'nsInterfaceHashtable.h',
     'nsJSThingHashtable.h',
     'nsMathUtils.h',
     'nsPointerHashKeys.h',
     'nsQuickSort.h',
     'nsRefPtrHashtable.h',
@@ -111,16 +113,21 @@ UNIFIED_SOURCES += [
     'nsSupportsPrimitives.cpp',
     'nsTArray.cpp',
     'nsTObserverArray.cpp',
     'nsVariant.cpp',
     'PLDHashTable.cpp',
     'Tokenizer.cpp',
 ]
 
+# XXX: will be moved to UNIFIED_SOURCES in the next patch
+SOURCES += [
+    'nsGkAtoms.cpp',
+]
+
 EXTRA_COMPONENTS += [
     'nsINIProcessor.js',
     'nsINIProcessor.manifest',
 ]
 
 LOCAL_INCLUDES += [
     '../io',
 ]
rename from dom/base/nsGkAtomList.h
rename to xpcom/ds/nsGkAtomList.h
--- a/dom/base/nsGkAtomList.h
+++ b/xpcom/ds/nsGkAtomList.h
@@ -1,29 +1,24 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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/. */
 // IWYU pragma: private, include "nsGkAtoms.h"
 
 /*
-  This file contains the list of all atoms used by gklayout;
-  see nsGkAtoms for access to the atoms.
-*/
-
-/*
-  This file is designed to be used as inline input to nsGkAtoms.cpp and nsGkAtoms.h
-  *only* through the magic of C preprocessing.
+  This file is designed to be used as inline input to nsGkAtoms.cpp and
+  nsGkAtoms.h *only* through the magic of C preprocessing.
 
   All entries must be enclosed in the macro GK_ATOM which will have cruel
-  and unusual things done to it
+  and unusual things done to it.
 
-  The first argument to GK_ATOM is the C++ name of the atom
-  The second argument it GK_ATOM is the string value of the atom
+  The first argument to GK_ATOM is the C++ name of the atom.
+  The second argument it GK_ATOM is the string value of the atom.
 */
 
 // OUTPUT_CLASS=nsGkAtoms
 // MACRO_NAME=GK_ATOM
 #ifdef small
 #undef small
 #endif
 
rename from dom/base/nsGkAtoms.cpp
rename to xpcom/ds/nsGkAtoms.cpp
rename from dom/base/nsGkAtoms.h
rename to xpcom/ds/nsGkAtoms.h