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

Bug 1599470, part 2 - Inline the now-infallible NullPrincipalURI::Create(). r=bzbarsky

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D54818

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrew McCreight 2019-11-27 16:08:28 +00:00
parent b0c1237a6f
commit b7a0475f37
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caps/NullPrincipal.cpp
View File

@ -86,8 +86,7 @@ nsresult NullPrincipal::Init(const OriginAttributes& aOriginAttributes,
mURI = aURI;
} else {
mURI = NullPrincipalURI::Create();
NS_ENSURE_TRUE(mURI, NS_ERROR_NOT_AVAILABLE);
mURI = new NullPrincipalURI();
}
nsAutoCString originNoSuffix;
@ -101,8 +100,7 @@ nsresult NullPrincipal::Init(const OriginAttributes& aOriginAttributes,
nsresult NullPrincipal::Init(const OriginAttributes& aOriginAttributes,
bool aIsFirstParty) {
mURI = NullPrincipalURI::Create();
NS_ENSURE_TRUE(mURI, NS_ERROR_NOT_AVAILABLE);
mURI = new NullPrincipalURI();
nsAutoCString originNoSuffix;
DebugOnly<nsresult> rv = mURI->GetSpec(originNoSuffix);

6
caps/NullPrincipalURI.cpp
View File

@ -31,12 +31,6 @@ NullPrincipalURI::NullPrincipalURI(const NullPrincipalURI& aOther) {
mPath.Assign(aOther.mPath);
}
/* static */
already_AddRefed<NullPrincipalURI> NullPrincipalURI::Create() {
RefPtr<NullPrincipalURI> uri = new NullPrincipalURI();
return uri.forget();
}
static NS_DEFINE_CID(kNullPrincipalURIImplementationCID,
NS_NULLPRINCIPALURI_IMPLEMENTATION_CID);

6
caps/NullPrincipalURI.h
View File

@ -37,15 +37,13 @@ class NullPrincipalURI final : public nsIURI, public nsISizeOf {
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIURI
NullPrincipalURI();
// nsISizeOf
virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
// Returns null on failure.
static already_AddRefed<NullPrincipalURI> Create();
private:
NullPrincipalURI();
NullPrincipalURI(const NullPrincipalURI& aOther);
~NullPrincipalURI() {}

2
layout/style/URLExtraData.cpp
View File

@ -18,7 +18,7 @@ StaticRefPtr<URLExtraData> URLExtraData::sDummy;
/* static */
void URLExtraData::InitDummy() {
RefPtr<nsIURI> baseURI = NullPrincipalURI::Create();
RefPtr<nsIURI> baseURI = new NullPrincipalURI();
nsCOMPtr<nsIReferrerInfo> referrerInfo = new dom::ReferrerInfo(nullptr);
sDummy = new URLExtraData(baseURI.forget(), referrerInfo.forget(),
NullPrincipal::CreateWithoutOriginAttributes());

9
layout/style/test/gtest/StyloParsingBench.cpp
View File

@ -35,9 +35,10 @@ static void ServoParsingBench(const StyleUseCounters* aCounters) {
cssStr.Append(css);
ASSERT_EQ(Encoding::UTF8ValidUpTo(css), css.Length());
RefPtr<NullPrincipalURI> uri = new NullPrincipalURI();
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo(nullptr);
RefPtr<URLExtraData> data =
new URLExtraData(NullPrincipalURI::Create(), referrerInfo.forget(),
new URLExtraData(uri.forget(), referrerInfo.forget(),
NullPrincipal::CreateWithoutOriginAttributes());
for (int i = 0; i < PARSING_REPETITIONS; i++) {
RefPtr<RawServoStyleSheetContents> stylesheet =
@ -51,9 +52,10 @@ static void ServoParsingBench(const StyleUseCounters* aCounters) {
static void ServoSetPropertyByIdBench(const nsACString& css) {
RefPtr<RawServoDeclarationBlock> block =
Servo_DeclarationBlock_CreateEmpty().Consume();
RefPtr<NullPrincipalURI> uri = new NullPrincipalURI();
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo(nullptr);
RefPtr<URLExtraData> data =
new URLExtraData(NullPrincipalURI::Create(), referrerInfo.forget(),
new URLExtraData(uri.forget(), referrerInfo.forget(),
NullPrincipal::CreateWithoutOriginAttributes());
ASSERT_TRUE(IsUtf8(css));
@ -69,9 +71,10 @@ static void ServoGetPropertyValueById() {
RefPtr<RawServoDeclarationBlock> block =
Servo_DeclarationBlock_CreateEmpty().Consume();
RefPtr<NullPrincipalURI> uri = new NullPrincipalURI();
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo(nullptr);
RefPtr<URLExtraData> data =
new URLExtraData(NullPrincipalURI::Create(), referrerInfo.forget(),
new URLExtraData(uri.forget(), referrerInfo.forget(),
NullPrincipal::CreateWithoutOriginAttributes());
NS_NAMED_LITERAL_CSTRING(css_, "10px");
const nsACString& css = css_;