diff --git a/layout/reftests/bugs/reftest-stylo.list b/layout/reftests/bugs/reftest-stylo.list index c3da3ffee4a6..95fff2713d40 100644 --- a/layout/reftests/bugs/reftest-stylo.list +++ b/layout/reftests/bugs/reftest-stylo.list @@ -1983,10 +1983,10 @@ fails == 1316719-1a.html 1316719-1a.html fails == 1316719-1b.html 1316719-1b.html fails == 1316719-1c.html 1316719-1c.html -fails HTTP == 652991-1a.html 652991-1a.html -fails HTTP == 652991-1b.html 652991-1b.html -fails HTTP == 652991-2.html 652991-2.html -fails HTTP == 652991-3.html 652991-3.html +HTTP == 652991-1a.html 652991-1a.html +HTTP == 652991-1b.html 652991-1b.html +HTTP == 652991-2.html 652991-2.html +HTTP == 652991-3.html 652991-3.html fails HTTP == 652991-4.html 652991-4.html diff --git a/layout/reftests/w3c-css/submitted/masking/reftest-stylo.list b/layout/reftests/w3c-css/submitted/masking/reftest-stylo.list index 938a7143ef83..125501d3f4c9 100644 --- a/layout/reftests/w3c-css/submitted/masking/reftest-stylo.list +++ b/layout/reftests/w3c-css/submitted/masking/reftest-stylo.list @@ -102,7 +102,7 @@ fuzzy(64,370) == clip-path-borderBox-1a.html clip-path-borderBox-1a.html == clip-path-viewBox-1c.html clip-path-viewBox-1c.html == clip-path-geometryBox-2.html clip-path-geometryBox-2.html -fails == clip-path-localRef-1.html clip-path-localRef-1.html +== clip-path-localRef-1.html clip-path-localRef-1.html default-preferences diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp index 3a10599b8eda..46f061c03b87 100644 --- a/layout/style/ServoBindings.cpp +++ b/layout/style/ServoBindings.cpp @@ -1509,6 +1509,7 @@ void Gecko_LoadStyleSheet(css::Loader* aLoader, ServoStyleSheet* aParent, RawServoImportRuleBorrowed aImportRule, + nsIURI* aBaseURI, const uint8_t* aURLString, uint32_t aURLStringLength, const uint8_t* aMediaString, @@ -1518,6 +1519,7 @@ Gecko_LoadStyleSheet(css::Loader* aLoader, MOZ_ASSERT(aLoader, "Should've catched this before"); MOZ_ASSERT(aParent, "Only used for @import, so parent should exist!"); MOZ_ASSERT(aURLString, "Invalid URLs shouldn't be loaded!"); + MOZ_ASSERT(aBaseURI, "Need a base URI"); RefPtr media = new nsMediaList(); if (aMediaStringLength) { MOZ_ASSERT(aMediaString); @@ -1533,7 +1535,7 @@ Gecko_LoadStyleSheet(css::Loader* aLoader, nsDependentCSubstring urlSpec(reinterpret_cast(aURLString), aURLStringLength); nsCOMPtr uri; - nsresult rv = NS_NewURI(getter_AddRefs(uri), urlSpec); + nsresult rv = NS_NewURI(getter_AddRefs(uri), urlSpec, nullptr, aBaseURI); if (NS_FAILED(rv)) { // Servo and Gecko have different ideas of what a valid URL is, so we might diff --git a/layout/style/ServoBindings.h b/layout/style/ServoBindings.h index f2d6492bf09d..f9c4e559b73c 100644 --- a/layout/style/ServoBindings.h +++ b/layout/style/ServoBindings.h @@ -131,6 +131,7 @@ RawGeckoElementBorrowedOrNull Gecko_GetDocumentElement(RawGeckoDocumentBorrowed void Gecko_LoadStyleSheet(mozilla::css::Loader* loader, mozilla::ServoStyleSheet* parent, RawServoImportRuleBorrowed import_rule, + nsIURI* base_uri, const uint8_t* url_bytes, uint32_t url_length, const uint8_t* media_bytes, diff --git a/layout/style/test/stylo-failures.md b/layout/style/test/stylo-failures.md index 772f8cb291a2..9bf4bf3c9284 100644 --- a/layout/style/test/stylo-failures.md +++ b/layout/style/test/stylo-failures.md @@ -79,7 +79,7 @@ to mochitest command. * test_bug389464.html: also font-size computation [1] * test_html_attribute_computed_values.html: also list-style-type [8] * test_bug387615.html: servo/servo#15006 [1] -* test_bug397427.html: @import issue bug 1331291 and CSSOM support of @import [3] +* test_bug397427.html: @import issue bug 1331291 and CSSOM support of @import [1] * console support: * test_bug413958.html `monitorConsole` [3] * test_parser_diagnostics_unprintables.html [550]