From b96d44e3292995b23f654f7f35c13434ac28ac80 Mon Sep 17 00:00:00 2001 From: Brad Werth Date: Tue, 11 Sep 2018 18:11:02 +0000 Subject: [PATCH] style: Change Gecko_ImageValue_Create to take a CORS mode argument. Differential Revision: https://phabricator.services.mozilla.com/D5106 --- components/style/gecko/url.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/components/style/gecko/url.rs b/components/style/gecko/url.rs index 8d785cae679d..2a1307985973 100644 --- a/components/style/gecko/url.rs +++ b/components/style/gecko/url.rs @@ -9,6 +9,7 @@ use gecko_bindings::bindings; use gecko_bindings::structs::ServoBundledURI; use gecko_bindings::structs::mozilla::css::URLValueData; use gecko_bindings::structs::root::{RustString, nsStyleImageRequest}; +use gecko_bindings::structs::root::mozilla::CORSMode; use gecko_bindings::structs::root::mozilla::css::{ImageValue, URLValue}; use gecko_bindings::sugar::refptr::RefPtr; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; @@ -186,15 +187,20 @@ impl SpecifiedImageUrl { Self::from_css_url(CssUrl::parse_from_string(url, context)) } - fn from_css_url(url: CssUrl) -> Self { + fn from_css_url_with_cors(url: CssUrl, cors: CORSMode) -> Self { let image_value = unsafe { - let ptr = bindings::Gecko_ImageValue_Create(url.for_ffi()); + let ptr = bindings::Gecko_ImageValue_Create(url.for_ffi(), cors); // We do not expect Gecko_ImageValue_Create returns null. debug_assert!(!ptr.is_null()); RefPtr::from_addrefed(ptr) }; Self { url, image_value } } + + fn from_css_url(url: CssUrl) -> Self { + use gecko_bindings::structs::root::mozilla::CORSMode_CORS_NONE; + Self::from_css_url_with_cors(url, CORSMode_CORS_NONE) + } } impl Parse for SpecifiedImageUrl {