Bug 1323665 - Part 2: Allow StyleSheet.disabled CSSOM access to disable/enable a ServoStyleSheet. r?xidorn
Now that
bug 1290209 has landed, we can make StyleSheet.disabled work in Servo
styled documents. This fixes a bunch of test crashes due to the assertion no
longer firing.
MozReview-Commit-ID: 6sLrdrxWlvK
--- a/gfx/tests/crashtests/crashtests.list
+++ b/gfx/tests/crashtests/crashtests.list
@@ -37,18 +37,18 @@ load 393749-1.html
load 393822-1.html
load 394384-1.html
load 394246-1.html
load 394246-2.html
skip-if(Android) load 394751.xhtml # bug 922976
load 395335-1.xhtml
load 395458-1.html
load 396321-1.svg
-skip-if(stylo) load 398042-1.xhtml # bug 1323665
-skip-if(stylo) load 398042-2.xhtml # bug 1323665
+load 398042-1.xhtml
+load 398042-2.xhtml
load 402307-1.html
load 403464-1.html
load 404112-1.html
load 404112-2.html
load 405268-1.xhtml
load 407761-1.html
load 407842.html
load 408754-1.html
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -22,17 +22,17 @@ load 147320-1.html
load 148245-1.html
load 149014-1.html
load 150431-1.html
load 176915-1.html
asserts-if(stylo,13) load 191272-1.html # bug 1324636
load 199696-1.html
load 217903-1.html
load 223064-1.html
-skip-if(stylo) load 234851-1.html # bug 1323665
+load 234851-1.html
load 234851-2.html
load 241300-1.html
load 243159-1.html
load 243159-2.xhtml
load 243519-1.html
load 244490-1.html
load 254367-1.html
load 263359-1.html
@@ -167,17 +167,17 @@ asserts-if(stylo,0-1) load 383129-1.html
skip-if(stylo) load 383806-1.xhtml # bug 1323649
load 384344-1.html
load 384392-1.xhtml
load 384392-2.svg
load 384649-1.xhtml
load 385354.html
load 385866-1.xhtml
load 385880-1.xhtml
-skip-if(stylo) load 386266-1.html # bug 1323665
+load 386266-1.html
load 386476.html
load 387195-1.html
load 387195-2.xhtml
load 388715-1.html
skip-if(stylo) load 390976-1.html # bug 1323649
load 393326-1.html
load 393326-2.html
load 393661-1.html
@@ -271,17 +271,17 @@ asserts(1) load 453894-1.xhtml # Bug 398
load 454751-1.xul
load 455063-1.html
load 455063-2.html
load 455063-3.html
load 455171-4.html
skip-if(stylo) load 455623-1.html # bug 1323652
load 457362-1.xhtml
load 457514.html
-skip-if(stylo) asserts(0-1) load 460389-1.html # Bug 1323665, bug 780985
+asserts(0-1) load 460389-1.html # bug 780985
asserts-if(stylo,1) load 462392.html # bug 1324683
load 466763-1.html
load 467881-1.html
load 468491-1.html
load 468546-1.xhtml
load 468555-1.xhtml
load 468563-1.html
load 468578-1.xhtml
@@ -308,17 +308,17 @@ load 487544-1.html
asserts-if(stylo,7) load 488390-1.xhtml # bug 1324663
load 489691.html
load 490376-1.xhtml
load 490559-1.html
asserts-if(stylo,4) load 490747.html # bug 1324663
load 491547-1.xul
load 491547-2.xul
load 492014.xhtml
-skip-if(stylo) load 492112-1.xhtml # bug 1323665
+load 492112-1.xhtml
asserts-if(stylo,1) load 492163-1.xhtml # bug 1324663
load 495350-1.html
skip-if(stylo) load 496011-1.xhtml # bug 1323649
load 497519-1.xhtml
load 497519-2.xhtml
load 497519-3.xhtml
load 497519-4.xhtml
load 499741-1.xhtml
--- a/layout/style/StyleSheet.cpp
+++ b/layout/style/StyleSheet.cpp
@@ -164,21 +164,17 @@ StyleSheet::GetDisabled(bool* aDisabled)
return NS_OK;
}
NS_IMETHODIMP
StyleSheet::SetDisabled(bool aDisabled)
{
// DOM method, so handle BeginUpdate/EndUpdate
MOZ_AUTO_DOC_UPDATE(mDocument, UPDATE_STYLE, true);
- if (IsGecko()) {
- AsGecko()->SetEnabled(!aDisabled);
- } else {
- MOZ_CRASH("stylo: unimplemented SetEnabled");
- }
+ SetEnabled(!aDisabled);
return NS_OK;
}
NS_IMETHODIMP
StyleSheet::GetOwnerNode(nsIDOMNode** aOwnerNode)
{
nsCOMPtr<nsIDOMNode> ownerNode = do_QueryInterface(GetOwnerNode());
ownerNode.forget(aOwnerNode);
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -84,17 +84,17 @@ load 466585-1.svg
load 467323-1.svg
load 467498-1.svg
load 470124-1.svg
load 472782-1.svg
load 474700-1.svg
load 475181-1.svg
load 475193-1.html
load 475302-1.svg
-skip-if(stylo) load 477935-1.html # bug 1323665
+load 477935-1.html
load 478128-1.svg
load 478511-1.svg
load 483439-1.svg
load 492186-1.svg
load 508247-1.svg
load 512890-1.svg
load 515288-1.html
load 522394-1.svg
--- a/netwerk/test/crashtests/crashtests.list
+++ b/netwerk/test/crashtests/crashtests.list
@@ -1,3 +1,3 @@
-skip-if(stylo) load 785753-1.html # bug 1323665
+asserts-if(stylo,5) load 785753-1.html # bug 1324634
asserts-if(stylo,4) load 785753-2.html # bug 1324634
load 1274044-1.html
--- a/view/crashtests/crashtests.list
+++ b/view/crashtests/crashtests.list
@@ -1,9 +1,9 @@
load 38589-1.xul
load 64049-1.html
-skip-if(stylo) load 281743-1.html # bug 1323665
+load 281743-1.html
load 323497-1.html
load 382756-1.xul
load 387745-1.svg
load 399852.html
load 429315-1.html
load 507563-1.html