зеркало из https://github.com/mozilla/pjs.git
Made external stylesheets load synchronously, always. Controlled by a define in case we want to re-enable asynch external stylesheets later. r=pierre,troy b=17309
This commit is contained in:
Родитель
53ae99d86e
Коммит
ac27ff03e7
|
@ -94,6 +94,12 @@
|
||||||
#include "nsITimerCallback.h"
|
#include "nsITimerCallback.h"
|
||||||
#include "nsDOMError.h"
|
#include "nsDOMError.h"
|
||||||
|
|
||||||
|
#ifdef ALLOW_ASYNCH_STYLE_SHEETS
|
||||||
|
const PRBool kBlock=PR_FALSE;
|
||||||
|
#else
|
||||||
|
const PRBool kBlock=PR_TRUE;
|
||||||
|
#endif
|
||||||
|
|
||||||
static NS_DEFINE_IID(kIDOMHTMLTitleElementIID, NS_IDOMHTMLTITLEELEMENT_IID);
|
static NS_DEFINE_IID(kIDOMHTMLTitleElementIID, NS_IDOMHTMLTITLEELEMENT_IID);
|
||||||
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
|
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
|
||||||
|
|
||||||
|
@ -3571,7 +3577,8 @@ HTMLContentSink::ProcessStyleLink(nsIHTMLContent* aElement,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PRBool blockParser = PR_FALSE;
|
PRBool blockParser = kBlock;
|
||||||
|
|
||||||
if (-1 != linkTypes.IndexOf("important")) {
|
if (-1 != linkTypes.IndexOf("important")) {
|
||||||
blockParser = PR_TRUE;
|
blockParser = PR_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -4342,7 +4349,7 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
|
||||||
nsAutoString params;
|
nsAutoString params;
|
||||||
SplitMimeType(type, mimeType, params);
|
SplitMimeType(type, mimeType, params);
|
||||||
|
|
||||||
PRBool blockParser = PR_FALSE; // hardwired off for now
|
PRBool blockParser = kBlock;
|
||||||
|
|
||||||
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
|
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
|
||||||
|
|
||||||
|
|
|
@ -94,6 +94,12 @@
|
||||||
#include "nsITimerCallback.h"
|
#include "nsITimerCallback.h"
|
||||||
#include "nsDOMError.h"
|
#include "nsDOMError.h"
|
||||||
|
|
||||||
|
#ifdef ALLOW_ASYNCH_STYLE_SHEETS
|
||||||
|
const PRBool kBlock=PR_FALSE;
|
||||||
|
#else
|
||||||
|
const PRBool kBlock=PR_TRUE;
|
||||||
|
#endif
|
||||||
|
|
||||||
static NS_DEFINE_IID(kIDOMHTMLTitleElementIID, NS_IDOMHTMLTITLEELEMENT_IID);
|
static NS_DEFINE_IID(kIDOMHTMLTitleElementIID, NS_IDOMHTMLTITLEELEMENT_IID);
|
||||||
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
|
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
|
||||||
|
|
||||||
|
@ -3571,7 +3577,8 @@ HTMLContentSink::ProcessStyleLink(nsIHTMLContent* aElement,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PRBool blockParser = PR_FALSE;
|
PRBool blockParser = kBlock;
|
||||||
|
|
||||||
if (-1 != linkTypes.IndexOf("important")) {
|
if (-1 != linkTypes.IndexOf("important")) {
|
||||||
blockParser = PR_TRUE;
|
blockParser = PR_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -4342,7 +4349,7 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
|
||||||
nsAutoString params;
|
nsAutoString params;
|
||||||
SplitMimeType(type, mimeType, params);
|
SplitMimeType(type, mimeType, params);
|
||||||
|
|
||||||
PRBool blockParser = PR_FALSE; // hardwired off for now
|
PRBool blockParser = kBlock;
|
||||||
|
|
||||||
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
|
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче