wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 106787 - Fix: Remove nsIAllocator and it's references. r=bsmedberg

Browse Source
This commit is contained in:
Márk Bartos 2014-04-14 17:20:45 +02:00
parent 1e34d2334e
commit 2aab2cb3ab
4 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embedding/browser/webBrowser/nsCommandHandler.cpp
View File

@ -8,7 +8,7 @@
#include "nsWebBrowser.h"
#include "nsDocShellTreeOwner.h"
#include "nsIAllocator.h"
#include "nsMemory.h"
#include "nsPIDOMWindow.h"
nsCommandHandler::nsCommandHandler() :
@ -118,7 +118,7 @@ NS_IMETHODIMP nsCommandHandler::Exec(const char *aCommand, const char *aStatus,
// Return an empty string
const char szEmpty[] = "";
*aResult = (char *) nsAllocator::Clone(szEmpty, sizeof(szEmpty));
*aResult = (char *) nsMemory::Clone(szEmpty, sizeof(szEmpty));
return NS_OK;
}
@ -141,7 +141,7 @@ NS_IMETHODIMP nsCommandHandler::Query(const char *aCommand, const char *aStatus,
// Return an empty string
const char szEmpty[] = "";
*aResult = (char *) nsAllocator::Clone(szEmpty, sizeof(szEmpty));
*aResult = (char *) nsMemory::Clone(szEmpty, sizeof(szEmpty));
return NS_OK;
}

1
xpcom/base/moz.build
View File

@ -49,7 +49,6 @@ EXPORTS += [
'nsDebugImpl.h',
'nsError.h',
'nsGZFileWriter.h',
'nsIAllocator.h',
'nsIID.h',
'nsInterfaceRequestorAgg.h',
'nsISizeOf.h',

1
xpcom/base/nsAllocator.h
View File

@ -10,7 +10,6 @@
#ifndef nsAllocator_h__
#define nsAllocator_h__
#include "nsIAllocator.h"
#include "nsAgg.h"
#include "nsIFactory.h"

23
xpcom/base/nsIAllocator.h
View File

@ -1,23 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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/. */
/**
* XXX This file is obsolete. Use nsIMemory.idl or nsMemory.h instead.
*/
#ifndef nsIAllocator_h___
#define nsIAllocator_h___
#include "nsMemory.h"
#define nsIAllocator nsIMemory
#define nsAllocator nsMemory
#define GetGlobalAllocator GetGlobalMemoryService
#define NS_IALLOCATOR_IID NS_GET_IID(nsIMemory)
#define NS_ALLOCATOR_CONTRACTID NS_MEMORY_CONTRACTID
#define NS_ALLOCATOR_CID NS_MEMORY_CID
#endif /* nsIAllocator_h___ */