Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

geckolib: Allow an ErrorReporter to be created with null URL data.

Browse source 
This allows us to create an ErrorReporter that will report errors as being
"from DOM" rather than a specific URL.

Also, factor out a method on ErrorReporter so that we don't need to pass in
a UrlExtraData reference.
This commit is contained in:
Cameron McCormack 2017-12-04 12:49:16 +08:00
parent 393ab5ab1e
commit 7940061c9a
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ports/geckolib/error_reporter.rs
View file

@ -16,7 +16,6 @@ use style::gecko_bindings::bindings::Gecko_ReportUnexpectedCSSError;
use style::gecko_bindings::structs::{Loader, ServoStyleSheet, nsIURI}; use style::gecko_bindings::structs::{Loader, ServoStyleSheet, nsIURI};
use style::gecko_bindings::structs::ErrorReporter as GeckoErrorReporter; use style::gecko_bindings::structs::ErrorReporter as GeckoErrorReporter;
use style::gecko_bindings::structs::URLExtraData as RawUrlExtraData; use style::gecko_bindings::structs::URLExtraData as RawUrlExtraData;
use style::gecko_bindings::sugar::refptr::RefPtr;
use style::stylesheets::UrlExtraData; use style::stylesheets::UrlExtraData;
use style_traits::StyleParseErrorKind; use style_traits::StyleParseErrorKind;
@ -29,10 +28,12 @@ impl ErrorReporter {
/// Create a new instance of the Gecko error reporter. /// Create a new instance of the Gecko error reporter.
pub fn new(sheet: *mut ServoStyleSheet, pub fn new(sheet: *mut ServoStyleSheet,
loader: *mut Loader, loader: *mut Loader,
url: *mut RawUrlExtraData) -> ErrorReporter { extra_data: *mut RawUrlExtraData) -> ErrorReporter {
unsafe { unsafe {
let url = RefPtr::from_ptr_ref(&url); let url = extra_data.as_ref()
ErrorReporter(Gecko_CreateCSSErrorReporter(sheet, loader, url.mBaseURI.raw::<nsIURI>())) .map(|d| d.mBaseURI.raw::<nsIURI>())
.unwrap_or(ptr::null_mut());
ErrorReporter(Gecko_CreateCSSErrorReporter(sheet, loader, url))
} }
} }
} }
@ -364,11 +365,8 @@ impl<'a> ErrorHelpers<'a> for ContextualParseError<'a> {
} }
} }
impl ParseErrorReporter for ErrorReporter { impl ErrorReporter {
fn report_error(&self, pub fn report(&self, location: SourceLocation, error: ContextualParseError) {
_url: &UrlExtraData,
location: SourceLocation,
error: ContextualParseError) {
let (pre, name, action) = error.to_gecko_message(); let (pre, name, action) = error.to_gecko_message();
let suffix = match action { let suffix = match action {
Action::Nothing => ptr::null(), Action::Nothing => ptr::null(),
@ -400,3 +398,14 @@ impl ParseErrorReporter for ErrorReporter {
} }
} }
} }
impl ParseErrorReporter for ErrorReporter {
fn report_error(
&self,
_url: &UrlExtraData,
location: SourceLocation,
error: ContextualParseError
) {
self.report(location, error)
}
}