Commit 78de0bd3 authored by Iulian Moraru's avatar Iulian Moraru
Browse files

Backed out changeset 9df1cbb9878c (bug 1832591) for causing build bustages on... 

Backed out changeset 9df1cbb9878c (bug 1832591) for causing build bustages on URLPreloader.cpp. CLOSED TREE
parent fd6836d5

js/xpconnect/loader/ScriptPreloader.cpp

+2 −15
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "mozilla/dom/ContentParent.h"

#include "mozilla/dom/Document.h"



#include "crc32c.h"

#include "js/CompileOptions.h"  // JS::ReadOnlyCompileOptions

#include "js/experimental/JSStencil.h"

#include "js/Transcoding.h"
@@ -402,7 +401,7 @@ Result<nsCOMPtr<nsIFile>, nsresult> ScriptPreloader::GetCacheFile( 
  return std::move(cacheFile);

}



static const uint8_t MAGIC[] = "mozXDRcachev003";

static const uint8_t MAGIC[] = "mozXDRcachev002";



Result<Ok, nsresult> ScriptPreloader::OpenCache() {

  MOZ_TRY(NS_GetSpecialDirectory("ProfLDS", getter_AddRefs(mProfD)));
@@ -511,8 +510,7 @@ Result<Ok, nsresult> ScriptPreloader::InitCacheInternal( 
  auto size = mCacheData->size();



  uint32_t headerSize;

  uint32_t crc;

  if (size < sizeof(MAGIC) + sizeof(headerSize) + sizeof(crc)) {

  if (size < sizeof(MAGIC) + sizeof(headerSize)) {

    return Err(NS_ERROR_UNEXPECTED);

  }
@@ -529,17 +527,10 @@ Result<Ok, nsresult> ScriptPreloader::InitCacheInternal( 
  headerSize = LittleEndian::readUint32(data.get());

  data += sizeof(headerSize);



  crc = LittleEndian::readUint32(data.get());

  data += sizeof(crc);



  if (data + headerSize > end) {

    return Err(NS_ERROR_UNEXPECTED);

  }



  if (crc != ComputeCrc32c(~0, data.get(), headerSize)) {

    return Err(NS_ERROR_UNEXPECTED);

  }



  {

    auto cleanup = MakeScopeExit([&]() { mScripts.Clear(); });
@@ -735,12 +726,8 @@ Result<Ok, nsresult> ScriptPreloader::WriteCache() { 
    uint8_t headerSize[4];

    LittleEndian::writeUint32(headerSize, buf.cursor());



    uint8_t crc[4];

    LittleEndian::writeUint32(crc, ComputeCrc32c(~0, buf.Get(), buf.cursor()));



    MOZ_TRY(Write(fd, MAGIC, sizeof(MAGIC)));

    MOZ_TRY(Write(fd, headerSize, sizeof(headerSize)));

    MOZ_TRY(Write(fd, crc, sizeof(crc)));

    MOZ_TRY(Write(fd, buf.Get(), buf.cursor()));



    // Align the start of the scripts section to the transcode alignment.

js/xpconnect/loader/URLPreloader.cpp

+2 −15
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "mozilla/Unused.h"

#include "mozilla/Vector.h"



#include "crc32c.h"

#include "MainThreadUtils.h"

#include "nsPrintfCString.h"

#include "nsDebug.h"
@@ -166,7 +165,7 @@ Result<nsCOMPtr<nsIFile>, nsresult> URLPreloader::GetCacheFile( 
  return std::move(cacheFile);

}



static const uint8_t URL_MAGIC[] = "mozURLcachev003";

static const uint8_t URL_MAGIC[] = "mozURLcachev002";



Result<nsCOMPtr<nsIFile>, nsresult> URLPreloader::FindCacheFile() {

  nsCOMPtr<nsIFile> cacheFile;
@@ -236,12 +235,8 @@ Result<Ok, nsresult> URLPreloader::WriteCache() { 
    uint8_t headerSize[4];

    LittleEndian::writeUint32(headerSize, buf.cursor());



    uint8_t crc[4];

    LittleEndian::writeUint32(crc, ComputeCrc32c(~0, buf.Get(), buf.cursor()));



    MOZ_TRY(Write(fd, URL_MAGIC, sizeof(URL_MAGIC)));

    MOZ_TRY(Write(fd, headerSize, sizeof(headerSize)));

    MOZ_TRY(Write(fd, crc, sizeof(crc)));

    MOZ_TRY(Write(fd, buf.Get(), buf.cursor()));

  }
@@ -268,8 +263,7 @@ Result<Ok, nsresult> URLPreloader::ReadCache( 
  auto size = cache.size();



  uint32_t headerSize;

  uint32_t crc;

  if (size < sizeof(MAGIC) + sizeof(headerSize) + sizeof(crc)) {

  if (size < sizeof(URL_MAGIC) + sizeof(headerSize)) {

    return Err(NS_ERROR_UNEXPECTED);

  }
@@ -284,17 +278,10 @@ Result<Ok, nsresult> URLPreloader::ReadCache( 
  headerSize = LittleEndian::readUint32(data.get());

  data += sizeof(headerSize);



  crc = LittleEndian::readUint32(data.get());

  data += sizeof(crc);



  if (data + headerSize > end) {

    return Err(NS_ERROR_UNEXPECTED);

  }



  if (crc != ComputeCrc32c(~0, data.get(), headerSize)) {

    return Err(NS_ERROR_UNEXPECTED);

  }



  {

    mMonitor.AssertCurrentThreadOwns();

js/xpconnect/loader/moz.build

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ LOCAL_INCLUDES += [ 
    "/dom/base",

    "/js/loader",

    "/xpcom/base/",

    "/xpcom/io",  # crc32c.h

]



include("/ipc/chromium/chromium-config.mozbuild")