aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Howell <michael@notriddle.com>2015-07-14 20:57:41 -0700
committerMichael Howell <michael@notriddle.com>2015-07-15 12:30:33 -0700
commit602c8bb41562c9ca6de508fc5de38de4da329117 (patch)
tree50d57ebcb68208df2b1a7cbd970f7fbbacc4f9f6
parent9af229b83095f2f8cfe7b61003b85ddf781f4ea7 (diff)
downloadservo-602c8bb41562c9ca6de508fc5de38de4da329117.tar.gz
servo-602c8bb41562c9ca6de508fc5de38de4da329117.zip
Don't crash when Firefox doesn't send autoMargins.
-rw-r--r--components/devtools/actors/inspector.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs
index 4aee2f1a166..cb6f38ecd87 100644
--- a/components/devtools/actors/inspector.rs
+++ b/components/devtools/actors/inspector.rs
@@ -459,7 +459,8 @@ impl Actor for PageStyleActor {
.unwrap();
let (width, height) = rx.recv().unwrap();
- let auto_margins = msg.get(&"autoMargins".to_string()).unwrap().as_boolean().unwrap();
+ let auto_margins = msg.get(&"autoMargins".to_string())
+ .and_then(&Json::as_boolean).unwrap_or(false);
//TODO: the remaining layout properties (margin, border, padding, position)
// as specified in getLayout in