Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset dd3a293cf053 (bug 1366247) for making Stylo build, but not run

Browse Source 
MozReview-Commit-ID: JcbwZSt05cN
This commit is contained in:
Phil Ringnalda 2017-05-21 12:55:08 -07:00
parent 1ed03a415f
commit ad7f3e6ef3
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/style/ServoBindingList.h
View File

@ -153,9 +153,9 @@ SERVO_BINDING_FUNC(Servo_Keyframe_SetStyle, void,
RawServoDeclarationBlockBorrowed declarations)
SERVO_BINDING_FUNC(Servo_KeyframesRule_GetName, nsIAtom*,
RawServoKeyframesRuleBorrowed rule)
// This method takes an addrefed nsIAtom.
SERVO_BINDING_FUNC(Servo_KeyframesRule_SetName, void,
RawServoKeyframesRuleBorrowed rule,
already_AddRefed<nsIAtom> name)
RawServoKeyframesRuleBorrowed rule, nsIAtom* name)
SERVO_BINDING_FUNC(Servo_KeyframesRule_GetCount, uint32_t,
RawServoKeyframesRuleBorrowed rule)
SERVO_BINDING_FUNC(Servo_KeyframesRule_GetKeyframe, RawServoKeyframeStrong,

5
layout/style/ServoBindings.cpp
View File

@ -1849,10 +1849,9 @@ Gecko_CSSValue_SetStringFromAtom(nsCSSValueBorrowedMut aCSSValue,
}
void
Gecko_CSSValue_SetAtomIdent(nsCSSValueBorrowedMut aCSSValue,
already_AddRefed<nsIAtom> aAtom)
Gecko_CSSValue_SetAtomIdent(nsCSSValueBorrowedMut aCSSValue, nsIAtom* aAtom)
{
aCSSValue->SetAtomIdentValue(Move(aAtom));
aCSSValue->SetAtomIdentValue(already_AddRefed<nsIAtom>(aAtom));
}
void

3
layout/style/ServoBindings.h
View File

@ -476,7 +476,8 @@ void Gecko_CSSValue_SetString(nsCSSValueBorrowedMut css_value,
const uint8_t* string, uint32_t len, nsCSSUnit unit);
void Gecko_CSSValue_SetStringFromAtom(nsCSSValueBorrowedMut css_value,
nsIAtom* atom, nsCSSUnit unit);
void Gecko_CSSValue_SetAtomIdent(nsCSSValueBorrowedMut css_value, already_AddRefed<nsIAtom> atom);
// Take an addrefed nsIAtom and set it to the nsCSSValue
void Gecko_CSSValue_SetAtomIdent(nsCSSValueBorrowedMut css_value, nsIAtom* atom);
void Gecko_CSSValue_SetArray(nsCSSValueBorrowedMut css_value, int32_t len);
void Gecko_CSSValue_SetURL(nsCSSValueBorrowedMut css_value, ServoBundledURI uri);
void Gecko_CSSValue_SetInt(nsCSSValueBorrowedMut css_value, int32_t integer, nsCSSUnit unit);

3
layout/style/ServoBindings.toml
View File

@ -304,6 +304,7 @@ hide-types = [
]
raw-lines = [
"pub use nsstring::{nsACString, nsAString, nsString, nsStringRepr};",
"use gecko_bindings::structs::nsTArray;",
"type nsACString_internal = nsACString;",
"type nsAString_internal = nsAString;",
]
@ -313,7 +314,6 @@ structs-types = [
"mozilla::css::ImageValue",
"mozilla::css::URLValue",
"mozilla::Side",
"already_AddRefed",
"RawGeckoAnimationPropertySegment",
"RawGeckoComputedTiming",
"RawGeckoCSSPropertyIDList",
@ -410,7 +410,6 @@ structs-types = [
"nsStyleVariables",
"nsStyleVisibility",
"nsStyleXUL",
"nsTArray",
"nsTimingFunction",
"nscolor",
"nscoord",

2
layout/style/ServoKeyframesRule.cpp
View File

@ -261,7 +261,7 @@ ServoKeyframesRule::SetName(const nsAString& aName)
}
UpdateRule([this, &name]() {
Servo_KeyframesRule_SetName(mRawRule, name.forget());
Servo_KeyframesRule_SetName(mRawRule, name.forget().take());
});
return NS_OK;
}