mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
style: Paper over a crash in non-nightly
Differential Revision: https://phabricator.services.mozilla.com/D107400
This commit is contained in:
parent
108c50c6df
commit
b222bd3162
2 changed files with 15 additions and 16 deletions
|
@ -116,21 +116,6 @@ impl Default for StyleSystemOptions {
|
|||
}
|
||||
}
|
||||
|
||||
impl StyleSystemOptions {
|
||||
#[cfg(feature = "servo")]
|
||||
/// On Gecko's nightly build?
|
||||
pub fn is_nightly(&self) -> bool {
|
||||
false
|
||||
}
|
||||
|
||||
#[cfg(feature = "gecko")]
|
||||
/// On Gecko's nightly build?
|
||||
#[inline]
|
||||
pub fn is_nightly(&self) -> bool {
|
||||
structs::GECKO_IS_NIGHTLY
|
||||
}
|
||||
}
|
||||
|
||||
/// A shared style context.
|
||||
///
|
||||
/// There's exactly one of these during a given restyle traversal, and it's
|
||||
|
|
|
@ -1757,7 +1757,21 @@ impl UnparsedValue {
|
|||
shorthand_cache.insert((shorthand, longhand), declaration);
|
||||
}
|
||||
|
||||
Cow::Borrowed(&shorthand_cache[&(shorthand, longhand_id)])
|
||||
let key = (shorthand, longhand_id);
|
||||
match shorthand_cache.get(&key) {
|
||||
Some(decl) => Cow::Borrowed(decl),
|
||||
None => {
|
||||
// FIXME: We should always have the key here but it seems
|
||||
// sometimes we don't, see bug 1696409.
|
||||
#[cfg(feature = "gecko")]
|
||||
{
|
||||
if structs::GECKO_IS_NIGHTLY {
|
||||
panic!("Expected {:?} to be in the cache but it was not!", key);
|
||||
}
|
||||
}
|
||||
invalid_at_computed_value_time()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue