wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset e4b8bb93313b (bug 1229222)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-02-19 15:55:25 +01:00
parent 7ebb137164
commit 3252feb284
3 changed files with 17 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dom/base/ChromeUtils.cpp
View File

@ -50,7 +50,7 @@ ThreadSafeChromeUtils::NondeterministicGetWeakSetKeys(GlobalObject& aGlobal,
} }
} }
/* static */ void /* static */ void
ChromeUtils::OriginAttributesToSuffix(dom::GlobalObject& aGlobal, ChromeUtils::OriginAttributesToSuffix(dom::GlobalObject& aGlobal,
const dom::OriginAttributesDictionary& aAttrs, const dom::OriginAttributesDictionary& aAttrs,
nsCString& aSuffix) nsCString& aSuffix)
@ -71,17 +71,11 @@ ChromeUtils::OriginAttributesMatchPattern(dom::GlobalObject& aGlobal,
} }
/* static */ void /* static */ void
ChromeUtils::CreateDefaultOriginAttributes(dom::GlobalObject& aGlobal, ChromeUtils::CreateOriginAttributesWithUserContextId(dom::GlobalObject& aGlobal,
dom::OriginAttributesDictionary& aAttrs) const nsAString& aOrigin,
{ uint32_t aUserContextId,
aAttrs = GenericOriginAttributes(); dom::OriginAttributesDictionary& aAttrs,
} ErrorResult& aRv)
/* static */ void
ChromeUtils::CreateOriginAttributesFromOrigin(dom::GlobalObject& aGlobal,
const nsAString& aOrigin,
dom::OriginAttributesDictionary& aAttrs,
ErrorResult& aRv)
{ {
GenericOriginAttributes attrs; GenericOriginAttributes attrs;
nsAutoCString suffix; nsAutoCString suffix;
@ -89,17 +83,10 @@ ChromeUtils::CreateOriginAttributesFromOrigin(dom::GlobalObject& aGlobal,
aRv.Throw(NS_ERROR_FAILURE); aRv.Throw(NS_ERROR_FAILURE);
return; return;
} }
attrs.mUserContextId = aUserContextId;
aAttrs = attrs; aAttrs = attrs;
} }
/* static */ void
ChromeUtils::CreateOriginAttributesFromDict(dom::GlobalObject& aGlobal,
const dom::OriginAttributesDictionary& aAttrs,
dom::OriginAttributesDictionary& aNewAttrs)
{
aNewAttrs = aAttrs;
}
} // namespace dom } // namespace dom
} // namespace mozilla } // namespace mozilla

18
dom/base/ChromeUtils.h
View File

@ -59,19 +59,11 @@ public:
const dom::OriginAttributesPatternDictionary& aPattern); const dom::OriginAttributesPatternDictionary& aPattern);
static void static void
CreateDefaultOriginAttributes(dom::GlobalObject& aGlobal, CreateOriginAttributesWithUserContextId(dom::GlobalObject& aGlobal,
dom::OriginAttributesDictionary& aAttrs); const nsAString& aOrigin,
uint32_t aUserContextId,
static void dom::OriginAttributesDictionary& aAttrs,
CreateOriginAttributesFromOrigin(dom::GlobalObject& aGlobal, ErrorResult& aRv);
const nsAString& aOrigin,
dom::OriginAttributesDictionary& aAttrs,
ErrorResult& aRv);
static void
CreateOriginAttributesFromDict(dom::GlobalObject& aGlobal,
const dom::OriginAttributesDictionary& aAttrs,
dom::OriginAttributesDictionary& aNewAttrs);
}; };
} // namespace dom } // namespace dom

34
dom/webidl/ChromeUtils.webidl
View File

@ -30,39 +30,13 @@ interface ChromeUtils : ThreadSafeChromeUtils {
optional OriginAttributesPatternDictionary pattern); optional OriginAttributesPatternDictionary pattern);
/** /**
* Returns an OriginAttributesDictionary with all default attributes added * Returns an OriginAttributes dictionary using the origin URI but forcing
* and assigned default values. * the passed userContextId.
*
* @returns An OriginAttributesDictionary populated with the
* default attributes added and assigned default values.
*/
static OriginAttributesDictionary
createDefaultOriginAttributes();
/**
* Returns an OriginAttributesDictionary with values from the |origin| suffix
* and unspecified attributes added and assigned default values.
*
* @param origin The origin URI to create from.
* @returns An OriginAttributesDictionary with values from
* the origin suffix and unspecified attributes
* added and assigned default values.
*/ */
[Throws] [Throws]
static OriginAttributesDictionary static OriginAttributesDictionary
createOriginAttributesFromOrigin(DOMString origin); createOriginAttributesWithUserContextId(DOMString origin,
unsigned long userContextId);
/**
* Returns an OriginAttributesDictionary that is a copy of |originAttrs| with
* unspecified attributes added and assigned default values.
*
* @param originAttrs The origin attributes to copy.
* @returns An OriginAttributesDictionary copy of |originAttrs|
* with unspecified attributes added and assigned
* default values.
*/
static OriginAttributesDictionary
createOriginAttributesFromDict(optional OriginAttributesDictionary originAttrs);
}; };
/** /**