wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backing out to see whether it somehow fixes the orange

Browse Source
This commit is contained in:
bzbarsky@mit.edu 2007-12-02 14:02:47 -08:00
parent 202376d9be
commit 2214dafaee
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/xul/document/src/nsXULContentSink.cpp
View File

@ -959,16 +959,9 @@ XULContentSinkImpl::OpenTag(const PRUnichar** aAttributes,
// even though it is ignored (the nsPrototypeScriptElement
// has its own script-type).
element->mScriptTypeID = nsIProgrammingLanguage::JAVASCRIPT;
rv = OpenScript(aAttributes, aLineNumber);
NS_ENSURE_SUCCESS(rv, rv);
NS_ASSERTION(mState == eInScript || mState == eInDocumentElement,
"Unexpected state");
if (mState == eInScript) {
// OpenScript has pushed the nsPrototypeScriptElement onto the
// stack, so we're done.
return NS_OK;
}
// OpenScript will push the nsPrototypeScriptElement onto the
// stack, so we're done after this.
return OpenScript(aAttributes, aLineNumber);
}
// Set the correct script-type for the element.
@ -1011,15 +1004,7 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes,
rv = mimeHdrParser->GetParameter(typeAndParams, nsnull,
EmptyCString(), PR_FALSE, nsnull,
mimeType);
if (NS_FAILED(rv)) {
if (rv == NS_ERROR_INVALID_ARG) {
// Might as well bail out now instead of setting langID to
// nsIProgrammingLanguage::UNKNOWN and bailing out later.
return NS_OK;
}
// We do want the warning here
NS_ENSURE_SUCCESS(rv, rv);
}
NS_ENSURE_SUCCESS(rv, rv);
// Javascript keeps the fast path, optimized for most-likely type
// Table ordered from most to least likely JS MIME types. For .xul

6
content/xul/document/src/nsXULContentSink.h
View File

@ -105,12 +105,6 @@ protected:
const PRUint32 aLineNumber,
nsINodeInfo *aNodeInfo);
// If OpenScript returns NS_OK and after it returns our state is eInScript,
// that means that we created a prototype script and stuck it on
// mContextStack. If NS_OK is returned but the state is still
// eInDocumentElement then we didn't create a prototype script (e.g. the
// script had an unknown type), and the caller should create a prototype
// element.
nsresult OpenScript(const PRUnichar** aAttributes,
const PRUint32 aLineNumber);

2
layout/reftests/bugs/reftest.list
View File

@ -453,7 +453,7 @@ fails == 386310-1d.html 386310-1-ref.html
== 400171-2c.html 400171-2-ref.html
== 400421-1.html 400421-1-ref.html
== 400826-1.html 400826-1-ref.html
== 401496.xul about:blank
#== 401496.xul about:blank
== 402338-1.html 402338-1-ref.html
== 402950-1.html 402950-1-ref.html
== 403129-1.html 403129-1-ref.html