mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
9c5965b035
The bulk of this commit was generated with a script, executed at the top level of a typical source code checkout. The only non-machine-generated part was modifying MFBT's moz.build to reflect the new naming. CLOSED TREE makes big refactorings like this a piece of cake. # The main substitution. find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \ xargs perl -p -i -e ' s/nsRefPtr\.h/RefPtr\.h/g; # handle includes s/nsRefPtr ?</RefPtr</g; # handle declarations and variables ' # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h. perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h # Handle nsRefPtr.h itself, a couple places that define constructors # from nsRefPtr, and code generators specially. We do this here, rather # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename # things like nsRefPtrHashtable. perl -p -i -e 's/nsRefPtr/RefPtr/g' \ mfbt/nsRefPtr.h \ xpcom/glue/nsCOMPtr.h \ xpcom/base/OwningNonNull.h \ ipc/ipdl/ipdl/lower.py \ ipc/ipdl/ipdl/builtin.py \ dom/bindings/Codegen.py \ python/lldbutils/lldbutils/utils.py # In our indiscriminate substitution above, we renamed # nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up. find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \ xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g' if [ -d .git ]; then git mv mfbt/nsRefPtr.h mfbt/RefPtr.h else hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h fi
186 lines
4.8 KiB
C++
186 lines
4.8 KiB
C++
/* -*- 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/. */
|
|
|
|
#include "Omnijar.h"
|
|
|
|
#include "nsDirectoryService.h"
|
|
#include "nsDirectoryServiceDefs.h"
|
|
#include "nsIFile.h"
|
|
#include "nsZipArchive.h"
|
|
#include "nsNetUtil.h"
|
|
|
|
namespace mozilla {
|
|
|
|
nsIFile* Omnijar::sPath[2] = { nullptr, nullptr };
|
|
nsZipArchive* Omnijar::sReader[2] = { nullptr, nullptr };
|
|
bool Omnijar::sInitialized = false;
|
|
static bool sIsUnified = false;
|
|
static bool sIsNested[2] = { false, false };
|
|
|
|
static const char* sProp[2] = {
|
|
NS_GRE_DIR, NS_XPCOM_CURRENT_PROCESS_DIR
|
|
};
|
|
|
|
#define SPROP(Type) ((Type == mozilla::Omnijar::GRE) ? sProp[GRE] : sProp[APP])
|
|
|
|
void
|
|
Omnijar::CleanUpOne(Type aType)
|
|
{
|
|
if (sReader[aType]) {
|
|
sReader[aType]->CloseArchive();
|
|
NS_IF_RELEASE(sReader[aType]);
|
|
}
|
|
sReader[aType] = nullptr;
|
|
NS_IF_RELEASE(sPath[aType]);
|
|
}
|
|
|
|
void
|
|
Omnijar::InitOne(nsIFile* aPath, Type aType)
|
|
{
|
|
nsCOMPtr<nsIFile> file;
|
|
if (aPath) {
|
|
file = aPath;
|
|
} else {
|
|
nsCOMPtr<nsIFile> dir;
|
|
nsDirectoryService::gService->Get(SPROP(aType), NS_GET_IID(nsIFile),
|
|
getter_AddRefs(dir));
|
|
NS_NAMED_LITERAL_CSTRING(kOmnijarName, NS_STRINGIFY(OMNIJAR_NAME));
|
|
if (NS_FAILED(dir->Clone(getter_AddRefs(file))) ||
|
|
NS_FAILED(file->AppendNative(kOmnijarName))) {
|
|
return;
|
|
}
|
|
}
|
|
bool isFile;
|
|
if (NS_FAILED(file->IsFile(&isFile)) || !isFile) {
|
|
// If we're not using an omni.jar for GRE, and we don't have an
|
|
// omni.jar for APP, check if both directories are the same.
|
|
if ((aType == APP) && (!sPath[GRE])) {
|
|
nsCOMPtr<nsIFile> greDir, appDir;
|
|
bool equals;
|
|
nsDirectoryService::gService->Get(sProp[GRE], NS_GET_IID(nsIFile),
|
|
getter_AddRefs(greDir));
|
|
nsDirectoryService::gService->Get(sProp[APP], NS_GET_IID(nsIFile),
|
|
getter_AddRefs(appDir));
|
|
if (NS_SUCCEEDED(greDir->Equals(appDir, &equals)) && equals) {
|
|
sIsUnified = true;
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
|
|
bool equals;
|
|
if ((aType == APP) && (sPath[GRE]) &&
|
|
NS_SUCCEEDED(sPath[GRE]->Equals(file, &equals)) && equals) {
|
|
// If we're using omni.jar on both GRE and APP and their path
|
|
// is the same, we're in the unified case.
|
|
sIsUnified = true;
|
|
return;
|
|
}
|
|
|
|
RefPtr<nsZipArchive> zipReader = new nsZipArchive();
|
|
if (NS_FAILED(zipReader->OpenArchive(file))) {
|
|
return;
|
|
}
|
|
|
|
RefPtr<nsZipHandle> handle;
|
|
if (NS_SUCCEEDED(nsZipHandle::Init(zipReader, NS_STRINGIFY(OMNIJAR_NAME),
|
|
getter_AddRefs(handle)))) {
|
|
zipReader = new nsZipArchive();
|
|
if (NS_FAILED(zipReader->OpenArchive(handle))) {
|
|
return;
|
|
}
|
|
sIsNested[aType] = true;
|
|
}
|
|
|
|
CleanUpOne(aType);
|
|
sReader[aType] = zipReader;
|
|
NS_IF_ADDREF(sReader[aType]);
|
|
sPath[aType] = file;
|
|
NS_IF_ADDREF(sPath[aType]);
|
|
}
|
|
|
|
void
|
|
Omnijar::Init(nsIFile* aGrePath, nsIFile* aAppPath)
|
|
{
|
|
InitOne(aGrePath, GRE);
|
|
InitOne(aAppPath, APP);
|
|
sInitialized = true;
|
|
}
|
|
|
|
void
|
|
Omnijar::CleanUp()
|
|
{
|
|
CleanUpOne(GRE);
|
|
CleanUpOne(APP);
|
|
sInitialized = false;
|
|
}
|
|
|
|
already_AddRefed<nsZipArchive>
|
|
Omnijar::GetReader(nsIFile* aPath)
|
|
{
|
|
MOZ_ASSERT(IsInitialized(), "Omnijar not initialized");
|
|
|
|
bool equals;
|
|
nsresult rv;
|
|
|
|
if (sPath[GRE] && !sIsNested[GRE]) {
|
|
rv = sPath[GRE]->Equals(aPath, &equals);
|
|
if (NS_SUCCEEDED(rv) && equals) {
|
|
return GetReader(GRE);
|
|
}
|
|
}
|
|
if (sPath[APP] && !sIsNested[APP]) {
|
|
rv = sPath[APP]->Equals(aPath, &equals);
|
|
if (NS_SUCCEEDED(rv) && equals) {
|
|
return GetReader(APP);
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
nsresult
|
|
Omnijar::GetURIString(Type aType, nsACString& aResult)
|
|
{
|
|
MOZ_ASSERT(IsInitialized(), "Omnijar not initialized");
|
|
|
|
aResult.Truncate();
|
|
|
|
// Return an empty string for APP in the unified case.
|
|
if ((aType == APP) && sIsUnified) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsAutoCString omniJarSpec;
|
|
if (sPath[aType]) {
|
|
nsresult rv = NS_GetURLSpecFromActualFile(sPath[aType], omniJarSpec);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
aResult = "jar:";
|
|
if (sIsNested[aType]) {
|
|
aResult += "jar:";
|
|
}
|
|
aResult += omniJarSpec;
|
|
aResult += "!";
|
|
if (sIsNested[aType]) {
|
|
aResult += "/" NS_STRINGIFY(OMNIJAR_NAME) "!";
|
|
}
|
|
} else {
|
|
nsCOMPtr<nsIFile> dir;
|
|
nsDirectoryService::gService->Get(SPROP(aType), NS_GET_IID(nsIFile),
|
|
getter_AddRefs(dir));
|
|
nsresult rv = NS_GetURLSpecFromActualFile(dir, aResult);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
}
|
|
aResult += "/";
|
|
return NS_OK;
|
|
}
|
|
|
|
} /* namespace mozilla */
|