Commit e1f15307 authored by serge-sans-paille's avatar serge-sans-paille
Browse files

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

Differential Revision: https://phabricator.services.mozilla.com/D175599
parent d9d86616

modules/libjar/moz.build

+0 −2
Original line number Diff line number Diff line
@@ -45,5 +45,3 @@ XPCOM_MANIFESTS += [ 
include("/ipc/chromium/chromium-config.mozbuild")



FINAL_LIBRARY = "xul"
 


REQUIRES_UNIFIED_BUILD = True

modules/libjar/nsJARInputStream.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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;

modules/libjar/nsJARProtocolHandler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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()); }

modules/libjar/nsJARURI.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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);