Skip to content

Commit

Permalink
Backed out 2 changesets (bug 1754063, bug 1744043) for causing xpcshe…
Browse files Browse the repository at this point in the history
…ll failures on test_ext_clear_cached_resources.js. CLOSED TREE

Backed out changeset faf305b1b14d (bug 1754063)
Backed out changeset 24ee1c0756ae (bug 1744043)
  • Loading branch information
Marian-Vasile Laza committed Mar 8, 2022
1 parent d15db0f commit e861dfb
Show file tree
Hide file tree
Showing 12 changed files with 274 additions and 308 deletions.
7 changes: 4 additions & 3 deletions dom/xhr/XMLHttpRequestMainThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3966,9 +3966,10 @@ nsresult ArrayBufferBuilder::MapToFileInPackage(const nsCString& aFile,
nsresult rv;

// Open Jar file to get related attributes of target file.
RefPtr<nsZipArchive> zip = nsZipArchive::OpenArchive(aJarFile);
if (!zip) {
return NS_ERROR_FAILURE;
RefPtr<nsZipArchive> zip = new nsZipArchive();
rv = zip->OpenArchive(aJarFile);
if (NS_FAILED(rv)) {
return rv;
}
nsZipItem* zipItem = zip->GetItem(aFile.get());
if (!zipItem) {
Expand Down
16 changes: 8 additions & 8 deletions modules/libjar/nsIZipReader.idl
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@ interface nsIUTF8StringEnumerator;
interface nsIInputStream;
interface nsIFile;

[scriptable, builtinclass, uuid(fad6f72f-13d8-4e26-9173-53007a4afe71)]
[scriptable, uuid(fad6f72f-13d8-4e26-9173-53007a4afe71)]
interface nsIZipEntry : nsISupports
{
/**
* The type of compression used for the item. The possible values and
* their meanings are defined in the zip file specification at
* http://www.pkware.com/business_and_developers/developer/appnote/
*/
[infallible] readonly attribute unsigned short compression;
readonly attribute unsigned short compression;
/**
* The compressed size of the data in the item.
*/
[infallible] readonly attribute unsigned long size;
readonly attribute unsigned long size;
/**
* The uncompressed size of the data in the item.
*/
[infallible] readonly attribute unsigned long realSize;
readonly attribute unsigned long realSize;
/**
* The CRC-32 hash of the file in the entry.
*/
[infallible] readonly attribute unsigned long CRC32;
readonly attribute unsigned long CRC32;
/**
* True if the name of the entry ends with '/' and false otherwise.
*/
[infallible] readonly attribute boolean isDirectory;
readonly attribute boolean isDirectory;
/**
* The time at which this item was last modified.
*/
Expand All @@ -55,11 +55,11 @@ interface nsIZipEntry : nsISupports
* this attribute will be false for the nsIZipEntry for that directory.
* It is impossible for a file to be synthetic.
*/
[infallible] readonly attribute boolean isSynthetic;
readonly attribute boolean isSynthetic;
/**
* The UNIX style file permissions of this item.
*/
[infallible] readonly attribute unsigned long permissions;
readonly attribute unsigned long permissions;
};

[scriptable, uuid(9ba4ef54-e0a0-4f65-9d23-128482448885)]
Expand Down
Loading

0 comments on commit e861dfb

Please sign in to comment.