Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1534538 - Avoid sending CookieSettings from parent to child if not needed, r=Ehsan

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrea Marchesini 2019-03-14 06:57:45 +00:00
parent 69c2a0a877
commit 21180cb43c
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipc/glue/BackgroundUtils.cpp
View File

@ -733,9 +733,10 @@ void LoadInfoToParentLoadInfoForwarder(
nsCOMPtr<nsICookieSettings> cookieSettings;
nsresult rv = aLoadInfo->GetCookieSettings(getter_AddRefs(cookieSettings));
if (NS_SUCCEEDED(rv) && cookieSettings) {
CookieSettings* cs = static_cast<CookieSettings*>(cookieSettings.get());
if (NS_SUCCEEDED(rv) && cookieSettings && cs->HasBeenChanged()) {
CookieSettingsArgs args;
static_cast<CookieSettings*>(cookieSettings.get())->Serialize(args);
cs->Serialize(args);
cookieSettingsArgs = Some(args);
}

5
netwerk/cookie/CookieSettings.cpp
View File

@ -78,7 +78,7 @@ already_AddRefed<nsICookieSettings> CookieSettings::Create() {
}
CookieSettings::CookieSettings(uint32_t aCookieBehavior, State aState)
: mCookieBehavior(aCookieBehavior), mState(aState) {
: mCookieBehavior(aCookieBehavior), mState(aState), mToBeMerged(false) {
MOZ_ASSERT(NS_IsMainThread());
}
@ -149,6 +149,7 @@ CookieSettings::CookiePermission(nsIPrincipal* aPrincipal,
mCookiePermissions.AppendElement(permission);
}
mToBeMerged = true;
return NS_OK;
}
@ -180,6 +181,8 @@ void CookieSettings::Serialize(CookieSettingsArgs& aData) {
aData.cookiePermissions().AppendElement(
CookiePermissionData(principalInfo, cookiePermission));
}
mToBeMerged = false;
}
/* static */ void CookieSettings::Deserialize(

7
netwerk/cookie/CookieSettings.h
View File

@ -120,6 +120,11 @@ class CookieSettings final : public nsICookieSettings {
void Merge(const CookieSettingsArgs& aData);
// We don't want to send this object from parent to child process if there are
// no reasons. HasBeenChanged() returns true if the object has changed its
// internal state and it must be sent beck to the content process.
bool HasBeenChanged() const { return mToBeMerged; }
private:
enum State {
// No cookie permissions are allowed to be stored in this object.
@ -137,6 +142,8 @@ class CookieSettings final : public nsICookieSettings {
CookiePermissionList mCookiePermissions;
State mState;
bool mToBeMerged;
};
} // namespace net