KotJohansson/UXP
1
0
Fork 0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 14:54:25 +00:00
Code Issues Projects Releases Wiki Activity

Issue #2112 - Part 5: Remove Servo from forwarding code used by magic pointer classes

Browse Source
This commit is contained in:
FranklinDM
2024-03-25 02:02:08 +08:00
committed by roytam1
parent b1c9206051
commit a93a7bed47
52 changed files with 278 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/style/nsDOMCSSDeclaration.cpp
+18 -36
View File
@@ -131,21 +131,17 @@ nsDOMCSSDeclaration::SetCssText(const nsAString& aCssText)
mozAutoDocConditionalContentUpdateBatch autoUpdate(DocToUpdate(), true);
RefPtr<DeclarationBlock> newdecl;
if (olddecl->IsServo()) {
newdecl = ServoDeclarationBlock::FromCssText(aCssText);
} else {
RefPtr<css::Declaration> decl(new css::Declaration());
decl->InitializeEmpty();
nsCSSParser cssParser(env.mCSSLoader);
bool changed;
nsresult result = cssParser.ParseDeclarations(aCssText, env.mSheetURI,
env.mBaseURI, env.mPrincipal,
decl, &changed);
if (NS_FAILED(result) || !changed) {
return result;
}
newdecl = decl.forget();
RefPtr<css::Declaration> decl(new css::Declaration());
decl->InitializeEmpty();
nsCSSParser cssParser(env.mCSSLoader);
bool changed;
nsresult result = cssParser.ParseDeclarations(aCssText, env.mSheetURI,
env.mBaseURI, env.mPrincipal,
decl, &changed);
if (NS_FAILED(result) || !changed) {
return result;
}
newdecl = decl.forget();
return SetCSSDeclaration(newdecl);
}
@@ -300,17 +296,10 @@ nsDOMCSSDeclaration::ParsePropertyValue(const nsCSSPropertyID aPropID,
RefPtr<DeclarationBlock> decl = olddecl->EnsureMutable();
bool changed;
if (decl->IsGecko()) {
nsCSSParser cssParser(env.mCSSLoader);
cssParser.ParseProperty(aPropID, aPropValue,
env.mSheetURI, env.mBaseURI, env.mPrincipal,
decl->AsGecko(), &changed, aIsImportant);
} else {
nsIAtom* atom = nsCSSProps::AtomForProperty(aPropID);
NS_ConvertUTF16toUTF8 value(aPropValue);
changed = Servo_DeclarationBlock_SetProperty(
decl->AsServo()->Raw(), atom, false, &value, aIsImportant);
}
nsCSSParser cssParser(env.mCSSLoader);
cssParser.ParseProperty(aPropID, aPropValue,
env.mSheetURI, env.mBaseURI, env.mPrincipal,
decl->AsGecko(), &changed, aIsImportant);
if (!changed) {
// Parsing failed -- but we don't throw an exception for that.
return NS_OK;
@@ -347,17 +336,10 @@ nsDOMCSSDeclaration::ParseCustomPropertyValue(const nsAString& aPropertyName,
bool changed;
auto propName = Substring(aPropertyName, CSS_CUSTOM_NAME_PREFIX_LENGTH);
if (decl->IsGecko()) {
nsCSSParser cssParser(env.mCSSLoader);
cssParser.ParseVariable(propName, aPropValue, env.mSheetURI,
env.mBaseURI, env.mPrincipal, decl->AsGecko(),
&changed, aIsImportant);
} else {
RefPtr<nsIAtom> atom = NS_Atomize(propName);
NS_ConvertUTF16toUTF8 value(aPropValue);
changed = Servo_DeclarationBlock_SetProperty(
decl->AsServo()->Raw(), atom, true, &value, aIsImportant);
}
nsCSSParser cssParser(env.mCSSLoader);
cssParser.ParseVariable(propName, aPropValue, env.mSheetURI,
env.mBaseURI, env.mPrincipal, decl->AsGecko(),
&changed, aIsImportant);
if (!changed) {
// Parsing failed -- but we don't throw an exception for that.
return NS_OK;