Bug 1321754 - Part 2: Pass SheetType to Servo FFI functions that create sheets. r?xidorn
MozReview-Commit-ID: 2xWGZCUhjVZ
--- a/layout/style/ServoBindingList.h
+++ b/layout/style/ServoBindingList.h
@@ -19,20 +19,20 @@
*/
// Element data
SERVO_BINDING_FUNC(Servo_Element_ClearData, void, RawGeckoElementBorrowed node)
SERVO_BINDING_FUNC(Servo_Element_ShouldTraverse, bool, RawGeckoElementBorrowed node)
// Styleset and Stylesheet management
SERVO_BINDING_FUNC(Servo_StyleSheet_Empty, RawServoStyleSheetStrong,
- mozilla::css::SheetParsingMode parsing_mode)
+ mozilla::SheetType sheet_type)
SERVO_BINDING_FUNC(Servo_StyleSheet_FromUTF8Bytes, RawServoStyleSheetStrong,
const nsACString* data,
- mozilla::css::SheetParsingMode parsing_mode,
+ mozilla::SheetType sheet_type,
const nsACString* base_url,
ThreadSafeURIHolder* base,
ThreadSafeURIHolder* referrer,
ThreadSafePrincipalHolder* principal)
SERVO_BINDING_FUNC(Servo_StyleSheet_HasRules, bool,
RawServoStyleSheetBorrowed sheet)
SERVO_BINDING_FUNC(Servo_StyleSheet_GetRules, ServoCssRulesStrong,
RawServoStyleSheetBorrowed sheet)
--- a/layout/style/ServoStyleSheet.cpp
+++ b/layout/style/ServoStyleSheet.cpp
@@ -83,26 +83,26 @@ ServoStyleSheet::ParseSheet(const nsAStr
RefPtr<ThreadSafePrincipalHolder> principal =
new ThreadSafePrincipalHolder(aSheetPrincipal);
nsCString baseString;
nsresult rv = aBaseURI->GetSpec(baseString);
NS_ENSURE_SUCCESS(rv, rv);
NS_ConvertUTF16toUTF8 input(aInput);
- mSheet = Servo_StyleSheet_FromUTF8Bytes(&input, mParsingMode, &baseString,
+ mSheet = Servo_StyleSheet_FromUTF8Bytes(&input, mSheetType, &baseString,
base, referrer, principal).Consume();
return NS_OK;
}
void
ServoStyleSheet::LoadFailed()
{
- mSheet = Servo_StyleSheet_Empty(mParsingMode).Consume();
+ mSheet = Servo_StyleSheet_Empty(mSheetType).Consume();
}
void
ServoStyleSheet::DropSheet()
{
mSheet = nullptr;
}