From bc2c3e42db461ac44065b3a4bd3eba17bb4d006d Mon Sep 17 00:00:00 2001 From: "rbs%maths.uq.edu.au" Date: Mon, 16 Dec 2002 22:22:12 +0000 Subject: [PATCH] No need to attempt to load mathml.css if not necessary, b=183866, r=heikki, sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@135358 18797224-902f-48f8-a5cc-f745e15eee43 --- .../xml/document/src/nsXMLContentSink.cpp | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index d4c6a2e8ead..b9ecfec4ba5 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -1639,30 +1639,31 @@ MathMLElementFactoryImpl::CreateInstanceByTag(nsINodeInfo* aNodeInfo, nsCOMPtr doc; aNodeInfo->GetDocument(*getter_AddRefs(doc)); if (doc) { - PRBool alreadyLoaded = PR_FALSE; - PRInt32 i = 0, sheetCount = 0; - doc->GetNumberOfStyleSheets(PR_TRUE, &sheetCount); - for (; i < sheetCount; i++) { - nsCOMPtr sheet; - doc->GetStyleSheetAt(i, PR_TRUE, getter_AddRefs(sheet)); - NS_ASSERTION(sheet, "unexpected null stylesheet in the document"); - if (sheet) { - nsCOMPtr uri; - sheet->GetURL(*getter_AddRefs(uri)); - nsCAutoString uriStr; - uri->GetSpec(uriStr); - if (uriStr.Equals(kMathMLStyleSheetURI)) { - alreadyLoaded = PR_TRUE; - break; + nsCOMPtr htmlContainer(do_QueryInterface(doc)); + if (htmlContainer) { + PRBool enabled; + nsCOMPtr cssLoader; + htmlContainer->GetCSSLoader(*getter_AddRefs(cssLoader)); + if (cssLoader && NS_SUCCEEDED(cssLoader->GetEnabled(&enabled)) && enabled) { + PRBool alreadyLoaded = PR_FALSE; + PRInt32 i = 0, sheetCount = 0; + doc->GetNumberOfStyleSheets(PR_TRUE, &sheetCount); + for (; i < sheetCount; i++) { + nsCOMPtr sheet; + doc->GetStyleSheetAt(i, PR_TRUE, getter_AddRefs(sheet)); + NS_ASSERTION(sheet, "unexpected null stylesheet in the document"); + if (sheet) { + nsCOMPtr uri; + sheet->GetURL(*getter_AddRefs(uri)); + nsCAutoString uriStr; + uri->GetSpec(uriStr); + if (uriStr.Equals(kMathMLStyleSheetURI)) { + alreadyLoaded = PR_TRUE; + break; + } + } } - } - } - if (!alreadyLoaded) { - nsCOMPtr htmlContainer(do_QueryInterface(doc)); - if (htmlContainer) { - nsCOMPtr cssLoader; - htmlContainer->GetCSSLoader(*getter_AddRefs(cssLoader)); - if (cssLoader) { + if (!alreadyLoaded) { nsCOMPtr uri; NS_NewURI(getter_AddRefs(uri), kMathMLStyleSheetURI); if (uri) {