From d1c3021f432bc6e265a85ad8c2ec35be665aaa83 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 10 May 2017 16:23:59 -0700 Subject: [PATCH] Make unknown pres attrs panic --- ports/geckolib/glue.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 47d2c92b573..0d318e9e032 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -1441,18 +1441,14 @@ pub extern "C" fn Servo_MediaList_DeleteMedium(list: RawServoMediaListBorrowed, } macro_rules! get_longhand_from_id { - ($id:expr, $retval:expr) => { + ($id:expr) => { match PropertyId::from_nscsspropertyid($id) { Ok(PropertyId::Longhand(long)) => long, _ => { - error!("stylo: unknown presentation property with id {:?}", $id); - return $retval + panic!("stylo: unknown presentation property with id {:?}", $id); } } }; - ($id:expr) => { - get_longhand_from_id!($id, ()) - } } macro_rules! match_wrap_declared { @@ -1462,8 +1458,7 @@ macro_rules! match_wrap_declared { LonghandId::$property => PropertyDeclaration::$property($inner), )* _ => { - error!("stylo: Don't know how to handle presentation property {:?}", $longhand); - return + panic!("stylo: Don't know how to handle presentation property {:?}", $longhand); } } ) @@ -1475,7 +1470,7 @@ pub extern "C" fn Servo_DeclarationBlock_PropertyIsSet(declarations: property: nsCSSPropertyID) -> bool { use style::properties::PropertyDeclarationId; - let long = get_longhand_from_id!(property, false); + let long = get_longhand_from_id!(property); read_locked_arc(declarations, |decls: &PropertyDeclarationBlock| { decls.get(PropertyDeclarationId::Longhand(long)).is_some() })