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

Bug 1828386 - Make modules/libjar buildable outside of a unified build environment r=andi

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D175599
This commit is contained in:
serge-sans-paille 2023-04-18 13:43:20 +00:00
parent d9d8661689
commit e1f15307f4
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/libjar/moz.build
View File

@ -45,5 +45,3 @@ XPCOM_MANIFESTS += [
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul"
REQUIRES_UNIFIED_BUILD = True

6
modules/libjar/nsJARInputStream.cpp
View File

@ -9,6 +9,8 @@
#include "zipstruct.h" // defines ZIP compression codes
#include "nsZipArchive.h"
#include "mozilla/MmapFaultHandler.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/UniquePtrExtensions.h"
#include "nsEscape.h"
#include "nsDebug.h"
@ -81,7 +83,7 @@ nsresult nsJARInputStream::InitDirectory(nsJAR* aJar,
// Keep the zipReader for getting the actual zipItems
mJar = aJar;
mJar->mLock.AssertCurrentThreadIn();
UniquePtr<nsZipFind> find;
mozilla::UniquePtr<nsZipFind> find;
nsresult rv;
// We can get aDir's contents as strings via FindEntries
// with the following pattern (see nsIZipReader.findEntries docs)
@ -309,7 +311,7 @@ nsresult nsJARInputStream::ReadDirectory(char* aBuffer, uint32_t aCount,
uint32_t numRead = CopyDataToBuffer(aBuffer, aCount);
if (aCount > 0) {
RecursiveMutexAutoLock lock(mJar->mLock);
mozilla::RecursiveMutexAutoLock lock(mJar->mLock);
// empty the buffer and start writing directory entry lines to it
mBuffer.Truncate();
mCurPos = 0;

2
modules/libjar/nsJARProtocolHandler.cpp
View File

@ -21,7 +21,7 @@ static NS_DEFINE_CID(kZipReaderCacheCID, NS_ZIPREADERCACHE_CID);
//-----------------------------------------------------------------------------
StaticRefPtr<nsJARProtocolHandler> gJarHandler;
mozilla::StaticRefPtr<nsJARProtocolHandler> gJarHandler;
nsJARProtocolHandler::nsJARProtocolHandler() { MOZ_ASSERT(NS_IsMainThread()); }

4
modules/libjar/nsJARURI.cpp
View File

@ -21,8 +21,6 @@
using namespace mozilla::ipc;
static NS_DEFINE_CID(kJARURICID, NS_JARURI_CID);
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_CLASSINFO(nsJARURI, nullptr, nsIClassInfo::THREADSAFE, NS_JARURI_CID)
@ -488,7 +486,7 @@ nsresult nsJARURI::SetQuery(const nsACString& query) {
}
nsresult nsJARURI::SetQueryWithEncoding(const nsACString& query,
const Encoding* encoding) {
const mozilla::Encoding* encoding) {
return NS_MutateURI(mJAREntry)
.SetQueryWithEncoding(query, encoding)
.Finalize(mJAREntry);