Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 940720 - Build content/xul/templates in unified mode - r=ehsan

Browse Source
This commit is contained in:
Benoit Jacob 2013-11-20 11:29:04 -05:00
parent f16a5fb6b5
commit e8d0b5ec02
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/xul/templates/src/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
SOURCES += [
UNIFIED_SOURCES += [
'nsContentSupportMap.cpp',
'nsContentTestNode.cpp',
'nsInstantiationNode.cpp',

5
content/xul/templates/src/nsXULSortService.h
View File

@ -20,6 +20,9 @@
This sort service is used to sort template built content or content by attribute.
*/
#ifndef nsXULTemplateResultSetRDF_h
#define nsXULTemplateResultSetRDF_h
#include "nsCOMPtr.h"
#include "nsCOMArray.h"
#include "nsTArray.h"
@ -179,3 +182,5 @@ public:
const nsAString& aRight,
uint32_t aSortHints);
};
#endif

7
content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

@ -73,11 +73,6 @@
using namespace mozilla::dom;
using namespace mozilla;
//----------------------------------------------------------------------
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
//----------------------------------------------------------------------
//
// nsXULTemplateBuilder
@ -144,10 +139,12 @@ nsXULTemplateBuilder::InitGlobals()
if (gRefCnt++ == 0) {
// Initialize the global shared reference to the service
// manager and get some shared resource objects.
NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
rv = CallGetService(kRDFServiceCID, &gRDFService);
if (NS_FAILED(rv))
return rv;
NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
if (NS_FAILED(rv))
return rv;

5
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
View File

@ -37,9 +37,6 @@
//----------------------------------------------------------------------
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
#define PARSE_TYPE_INTEGER "Integer"
nsrefcnt nsXULTemplateQueryProcessorRDF::gRefCnt = 0;
@ -145,12 +142,14 @@ nsXULTemplateQueryProcessorRDF::InitGlobals()
// Initialize the global shared reference to the service
// manager and get some shared resource objects.
if (!gRDFService) {
NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
rv = CallGetService(kRDFServiceCID, &gRDFService);
if (NS_FAILED(rv))
return rv;
}
if (!gRDFContainerUtils) {
NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
if (NS_FAILED(rv))
return rv;