From eff3f9d4c44096f70daaec5b2d3a7c4afcf16289 Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Thu, 5 Mar 2015 14:46:18 +1100 Subject: [PATCH] Bug 1139723 - Turn on expensive style struct assertions for 1136010-1.html, and fix pref name typo. r=dbaron --- layout/style/crashtests/crashtests.list | 2 +- layout/style/nsStyleContext.cpp | 2 +- modules/libpref/init/all.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index 8c16dc76870b..2794c039321f 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -111,6 +111,6 @@ load 1028514-1.html load 1066089-1.html load 1074651-1.html pref(dom.webcomponents.enabled,true) load 1089463-1.html -load 1136010-1.html +pref(layout.css.expensive-style-struct-assertions.enabled,true) load 1136010-1.html load large_border_image_width.html load border-image-visited-link.html diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp index d9208d9ed11d..7f428374e3e9 100644 --- a/layout/style/nsStyleContext.cpp +++ b/layout/style/nsStyleContext.cpp @@ -1397,6 +1397,6 @@ nsStyleContext::Initialize() { Preferences::AddBoolVarCache( &sExpensiveStyleStructAssertionsEnabled, - "layout.css.expensive-style-struct-assertions.enabed"); + "layout.css.expensive-style-struct-assertions.enabled"); } #endif diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index dfb894337838..24b3806311c8 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -4155,7 +4155,7 @@ pref("layout.css.touch_action.enabled", false); // Enables some assertions in nsStyleContext that are too expensive // for general use, but might be useful to enable for specific tests. // This only has an effect in DEBUG-builds. -pref("layout.css.expensive-style-struct-assertions.enabed", false); +pref("layout.css.expensive-style-struct-assertions.enabled", false); // enable JS dump() function. pref("browser.dom.window.dump.enabled", false);