mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 13:25:37 +00:00
Bug 1459111 - Rename ServoCSSParsingEnvironment to ParsingEnvironment. r=emilio
MozReview-Commit-ID: Jl5aoarH0aU
This commit is contained in:
parent
00643f1030
commit
705b29c214
@ -40,7 +40,7 @@ struct URLExtraData;
|
||||
class ServoCSSParser
|
||||
{
|
||||
public:
|
||||
using ParsingEnvironment = nsDOMCSSDeclaration::ServoCSSParsingEnvironment;
|
||||
using ParsingEnvironment = nsDOMCSSDeclaration::ParsingEnvironment;
|
||||
|
||||
/**
|
||||
* Returns whether the specified string can be parsed as a valid CSS
|
||||
|
@ -57,10 +57,10 @@ public:
|
||||
});
|
||||
return NS_OK;
|
||||
}
|
||||
ServoCSSParsingEnvironment GetServoCSSParsingEnvironment(
|
||||
ParsingEnvironment GetParsingEnvironment(
|
||||
nsIPrincipal* aSubjectPrincipal) const final
|
||||
{
|
||||
return GetServoCSSParsingEnvironmentForRule(mRule);
|
||||
return GetParsingEnvironmentForRule(mRule);
|
||||
}
|
||||
nsIDocument* DocToUpdate() final { return nullptr; }
|
||||
|
||||
|
@ -87,11 +87,11 @@ ServoPageRuleDeclaration::DocToUpdate()
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
ServoPageRuleDeclaration::GetServoCSSParsingEnvironment(
|
||||
nsDOMCSSDeclaration::ParsingEnvironment
|
||||
ServoPageRuleDeclaration::GetParsingEnvironment(
|
||||
nsIPrincipal* aSubjectPrincipal) const
|
||||
{
|
||||
return GetServoCSSParsingEnvironmentForRule(Rule());
|
||||
return GetParsingEnvironmentForRule(Rule());
|
||||
}
|
||||
|
||||
// -- ServoPageRule --------------------------------------------------
|
||||
|
@ -35,8 +35,8 @@ protected:
|
||||
DeclarationBlock* GetCSSDeclaration(Operation aOperation) final;
|
||||
nsresult SetCSSDeclaration(DeclarationBlock* aDecl) final;
|
||||
nsIDocument* DocToUpdate() final;
|
||||
nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
GetServoCSSParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
nsDOMCSSDeclaration::ParsingEnvironment
|
||||
GetParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
|
||||
private:
|
||||
// For accessing the constructor.
|
||||
|
@ -92,11 +92,11 @@ ServoStyleRuleDeclaration::DocToUpdate()
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
ServoStyleRuleDeclaration::GetServoCSSParsingEnvironment(
|
||||
nsDOMCSSDeclaration::ParsingEnvironment
|
||||
ServoStyleRuleDeclaration::GetParsingEnvironment(
|
||||
nsIPrincipal* aSubjectPrincipal) const
|
||||
{
|
||||
return GetServoCSSParsingEnvironmentForRule(Rule());
|
||||
return GetParsingEnvironmentForRule(Rule());
|
||||
}
|
||||
|
||||
// -- ServoStyleRule --------------------------------------------------
|
||||
|
@ -36,8 +36,8 @@ protected:
|
||||
DeclarationBlock* GetCSSDeclaration(Operation aOperation) final;
|
||||
nsresult SetCSSDeclaration(DeclarationBlock* aDecl) final;
|
||||
nsIDocument* DocToUpdate() final;
|
||||
ServoCSSParsingEnvironment
|
||||
GetServoCSSParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
ParsingEnvironment
|
||||
GetParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
|
||||
private:
|
||||
// For accessing the constructor.
|
||||
|
@ -758,11 +758,11 @@ nsComputedDOMStyle::DocToUpdate()
|
||||
MOZ_CRASH("called nsComputedDOMStyle::DocToUpdate");
|
||||
}
|
||||
|
||||
nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
nsComputedDOMStyle::GetServoCSSParsingEnvironment(
|
||||
nsDOMCSSDeclaration::ParsingEnvironment
|
||||
nsComputedDOMStyle::GetParsingEnvironment(
|
||||
nsIPrincipal* aSubjectPrincipal) const
|
||||
{
|
||||
MOZ_CRASH("called nsComputedDOMStyle::GetServoCSSParsingEnvironment");
|
||||
MOZ_CRASH("called nsComputedDOMStyle::GetParsingEnvironment");
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -128,8 +128,8 @@ public:
|
||||
virtual nsresult SetCSSDeclaration(mozilla::DeclarationBlock*) override;
|
||||
virtual nsIDocument* DocToUpdate() override;
|
||||
|
||||
nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
GetServoCSSParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
nsDOMCSSDeclaration::ParsingEnvironment
|
||||
GetParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
|
||||
static already_AddRefed<nsROCSSPrimitiveValue>
|
||||
MatrixToCSSValue(const mozilla::gfx::Matrix4x4& aMatrix);
|
||||
|
@ -157,8 +157,8 @@ nsDOMCSSAttributeDeclaration::GetCSSDeclaration(Operation aOperation)
|
||||
return decl;
|
||||
}
|
||||
|
||||
nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
nsDOMCSSAttributeDeclaration::GetServoCSSParsingEnvironment(
|
||||
nsDOMCSSDeclaration::ParsingEnvironment
|
||||
nsDOMCSSAttributeDeclaration::GetParsingEnvironment(
|
||||
nsIPrincipal* aSubjectPrincipal) const
|
||||
{
|
||||
return {
|
||||
|
@ -36,8 +36,8 @@ public:
|
||||
// is owned by our current style rule.
|
||||
mozilla::DeclarationBlock* GetCSSDeclaration(Operation aOperation) final;
|
||||
|
||||
nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
GetServoCSSParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
nsDOMCSSDeclaration::ParsingEnvironment
|
||||
GetParsingEnvironment(nsIPrincipal* aSubjectPrincipal) const final;
|
||||
|
||||
mozilla::css::Rule* GetParentRule() override
|
||||
{
|
||||
|
@ -118,8 +118,8 @@ nsDOMCSSDeclaration::SetCssText(const nsAString& aCssText,
|
||||
// rule (see stack in bug 209575).
|
||||
mozAutoDocConditionalContentUpdateBatch autoUpdate(DocToUpdate(), true);
|
||||
|
||||
ServoCSSParsingEnvironment servoEnv =
|
||||
GetServoCSSParsingEnvironment(aSubjectPrincipal);
|
||||
ParsingEnvironment servoEnv =
|
||||
GetParsingEnvironment(aSubjectPrincipal);
|
||||
if (!servoEnv.mUrlExtraData) {
|
||||
aRv.Throw(NS_ERROR_NOT_AVAILABLE);
|
||||
return;
|
||||
@ -220,8 +220,8 @@ nsDOMCSSDeclaration::RemoveProperty(const nsAString& aPropertyName,
|
||||
return RemovePropertyInternal(aPropertyName);
|
||||
}
|
||||
|
||||
/* static */ nsDOMCSSDeclaration::ServoCSSParsingEnvironment
|
||||
nsDOMCSSDeclaration::GetServoCSSParsingEnvironmentForRule(const css::Rule* aRule)
|
||||
/* static */ nsDOMCSSDeclaration::ParsingEnvironment
|
||||
nsDOMCSSDeclaration::GetParsingEnvironmentForRule(const css::Rule* aRule)
|
||||
{
|
||||
StyleSheet* sheet = aRule ? aRule->GetStyleSheet() : nullptr;
|
||||
if (!sheet) {
|
||||
@ -262,8 +262,8 @@ nsDOMCSSDeclaration::ModifyDeclaration(nsIPrincipal* aSubjectPrincipal,
|
||||
RefPtr<DeclarationBlock> decl = olddecl->EnsureMutable();
|
||||
|
||||
bool changed;
|
||||
ServoCSSParsingEnvironment servoEnv =
|
||||
GetServoCSSParsingEnvironment(aSubjectPrincipal);
|
||||
ParsingEnvironment servoEnv =
|
||||
GetParsingEnvironment(aSubjectPrincipal);
|
||||
if (!servoEnv.mUrlExtraData) {
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
@ -286,7 +286,7 @@ nsDOMCSSDeclaration::ParsePropertyValue(const nsCSSPropertyID aPropID,
|
||||
{
|
||||
return ModifyDeclaration(
|
||||
aSubjectPrincipal,
|
||||
[&](ServoDeclarationBlock* decl, ServoCSSParsingEnvironment& env) {
|
||||
[&](ServoDeclarationBlock* decl, ParsingEnvironment& env) {
|
||||
NS_ConvertUTF16toUTF8 value(aPropValue);
|
||||
return Servo_DeclarationBlock_SetPropertyById(
|
||||
decl->Raw(), aPropID, &value, aIsImportant, env.mUrlExtraData,
|
||||
@ -303,7 +303,7 @@ nsDOMCSSDeclaration::ParseCustomPropertyValue(const nsAString& aPropertyName,
|
||||
MOZ_ASSERT(nsCSSProps::IsCustomPropertyName(aPropertyName));
|
||||
return ModifyDeclaration(
|
||||
aSubjectPrincipal,
|
||||
[&](ServoDeclarationBlock* decl, ServoCSSParsingEnvironment& env) {
|
||||
[&](ServoDeclarationBlock* decl, ParsingEnvironment& env) {
|
||||
NS_ConvertUTF16toUTF8 property(aPropertyName);
|
||||
NS_ConvertUTF16toUTF8 value(aPropValue);
|
||||
return Servo_DeclarationBlock_SetProperty(
|
||||
|
@ -111,13 +111,13 @@ public:
|
||||
|
||||
// Information needed to parse a declaration for Servo side.
|
||||
// Put this in public so other Servo parsing functions can reuse this.
|
||||
struct MOZ_STACK_CLASS ServoCSSParsingEnvironment
|
||||
struct MOZ_STACK_CLASS ParsingEnvironment
|
||||
{
|
||||
RefPtr<mozilla::URLExtraData> mUrlExtraData;
|
||||
nsCompatibility mCompatMode;
|
||||
mozilla::css::Loader* mLoader;
|
||||
|
||||
ServoCSSParsingEnvironment(mozilla::URLExtraData* aUrlData,
|
||||
ParsingEnvironment(mozilla::URLExtraData* aUrlData,
|
||||
nsCompatibility aCompatMode,
|
||||
mozilla::css::Loader* aLoader)
|
||||
: mUrlExtraData(aUrlData)
|
||||
@ -125,7 +125,7 @@ public:
|
||||
, mLoader(aLoader)
|
||||
{}
|
||||
|
||||
ServoCSSParsingEnvironment(already_AddRefed<mozilla::URLExtraData> aUrlData,
|
||||
ParsingEnvironment(already_AddRefed<mozilla::URLExtraData> aUrlData,
|
||||
nsCompatibility aCompatMode,
|
||||
mozilla::css::Loader* aLoader)
|
||||
: mUrlExtraData(aUrlData)
|
||||
@ -166,13 +166,13 @@ protected:
|
||||
// mCompatMode may not be set to anything meaningful.
|
||||
// If aSubjectPrincipal is passed, it should be the subject principal of the
|
||||
// scripted caller that initiated the parser.
|
||||
virtual ServoCSSParsingEnvironment
|
||||
GetServoCSSParsingEnvironment(nsIPrincipal* aSubjectPrincipal = nullptr) const = 0;
|
||||
virtual ParsingEnvironment
|
||||
GetParsingEnvironment(nsIPrincipal* aSubjectPrincipal = nullptr) const = 0;
|
||||
|
||||
// An implementation for GetServoCSSParsingEnvironment for callers wrapping a
|
||||
// An implementation for GetParsingEnvironment for callers wrapping a
|
||||
// css::Rule.
|
||||
static ServoCSSParsingEnvironment
|
||||
GetServoCSSParsingEnvironmentForRule(const mozilla::css::Rule* aRule);
|
||||
static ParsingEnvironment
|
||||
GetParsingEnvironmentForRule(const mozilla::css::Rule* aRule);
|
||||
|
||||
nsresult ParsePropertyValue(const nsCSSPropertyID aPropID,
|
||||
const nsAString& aPropValue,
|
||||
|
Loading…
Reference in New Issue
Block a user