diff -r 7e26c7da4463 -r fc2d59ddac77 netwerk/cookie/nsCookie.h --- a/netwerk/cookie/nsCookie.h Wed Dec 31 06:55:50 2014 +0100 +++ b/netwerk/cookie/nsCookie.h Wed Dec 31 07:22:50 2014 +0100 @@ -36,6 +36,7 @@ nsCookie(const char *aName, const char *aValue, const char *aHost, + const char *aOrigin, const char *aPath, const char *aEnd, int64_t aExpiry, @@ -47,6 +48,7 @@ : mName(aName) , mValue(aValue) , mHost(aHost) + , mOrigin(aOrigin) , mPath(aPath) , mEnd(aEnd) , mExpiry(aExpiry) @@ -68,6 +70,7 @@ static nsCookie * Create(const nsACString &aName, const nsACString &aValue, const nsACString &aHost, + const nsACString &aOrigin, const nsACString &aPath, int64_t aExpiry, int64_t aLastAccessed, @@ -83,8 +86,9 @@ // fast (inline, non-xpcom) getters inline const nsDependentCString Name() const { return nsDependentCString(mName, mValue - 1); } inline const nsDependentCString Value() const { return nsDependentCString(mValue, mHost - 1); } - inline const nsDependentCString Host() const { return nsDependentCString(mHost, mPath - 1); } - inline const nsDependentCString RawHost() const { return nsDependentCString(IsDomain() ? mHost + 1 : mHost, mPath - 1); } + inline const nsDependentCString Host() const { return nsDependentCString(mHost, mOrigin - 1); } + inline const nsDependentCString RawHost() const { return nsDependentCString(IsDomain() ? mHost + 1 : mHost, mOrigin - 1); } + inline const nsDependentCString Origin() const { return nsDependentCString(mOrigin, mPath - 1); } inline const nsDependentCString Path() const { return nsDependentCString(mPath, mEnd); } inline int64_t Expiry() const { return mExpiry; } // in seconds inline int64_t LastAccessed() const { return mLastAccessed; } // in microseconds @@ -113,6 +117,7 @@ const char *mName; const char *mValue; const char *mHost; + const char *mOrigin; const char *mPath; const char *mEnd; int64_t mExpiry;