Bug 1324700 - Servo_ParseProperty() takes nsCSSPropertyID instead of nsACString. r?heycam
MozReview-Commit-ID: Gn90DBlJSS9
--- a/dom/animation/KeyframeUtils.cpp
+++ b/dom/animation/KeyframeUtils.cpp
@@ -1009,27 +1009,25 @@ MakePropertyValuePair(nsCSSPropertyID aP
nsCSSParser& aParser, nsIDocument* aDocument)
{
MOZ_ASSERT(aDocument);
PropertyValuePair result;
result.mProperty = aProperty;
if (aDocument->GetStyleBackendType() == StyleBackendType::Servo) {
- nsCString name = nsCSSProps::GetStringValue(aProperty);
-
NS_ConvertUTF16toUTF8 value(aStringValue);
// FIXME this is using the wrong base uri (bug 1343919)
RefPtr<URLExtraData> data = new URLExtraData(aDocument->GetDocumentURI(),
aDocument->GetDocumentURI(),
aDocument->NodePrincipal());
RefPtr<RawServoDeclarationBlock> servoDeclarationBlock =
- Servo_ParseProperty(&name, &value, data).Consume();
+ Servo_ParseProperty(aProperty, &value, data).Consume();
if (servoDeclarationBlock) {
result.mServoDeclarationBlock = servoDeclarationBlock.forget();
}
return result;
}
nsCSSValue value;
--- a/layout/style/ServoBindingList.h
+++ b/layout/style/ServoBindingList.h
@@ -119,17 +119,17 @@ SERVO_BINDING_FUNC(Servo_PageRule_GetSty
RawServoPageRuleBorrowed rule)
SERVO_BINDING_FUNC(Servo_PageRule_SetStyle, void,
RawServoPageRuleBorrowed rule,
RawServoDeclarationBlockBorrowed declarations)
// Animations API
SERVO_BINDING_FUNC(Servo_ParseProperty,
RawServoDeclarationBlockStrong,
- const nsACString* property, const nsACString* value,
+ nsCSSPropertyID property, const nsACString* value,
RawGeckoURLExtraData* data)
SERVO_BINDING_FUNC(Servo_ParseEasing, bool,
const nsAString* easing,
RawGeckoURLExtraData* data,
nsTimingFunctionBorrowedMut output)
SERVO_BINDING_FUNC(Servo_GetComputedKeyframeValues, void,
RawGeckoKeyframeListBorrowed keyframes,
ServoComputedValuesBorrowed style,