Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the obsolete concept of "DTD verification". bug 323958, r+sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@188516 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2006-01-30 23:45:19 +00:00
parent f11df30b97
commit b7ece70d44
18 changed files with 23 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/parser/htmlparser/public/nsIParser.h
View File

@@ -226,18 +226,15 @@ class nsIParser : public nsISupports {
NS_IMETHOD Parse(nsIURI* aURL,
nsIRequestObserver* aListener = nsnull,
PRBool aEnableVerify = PR_FALSE,
void* aKey = 0,
nsDTDMode aMode = eDTDMode_autodetect) = 0;
NS_IMETHOD Parse(nsIInputStream* aStream,
const nsACString& aMimeType,
PRBool aEnableVerify = PR_FALSE,
void* aKey = 0,
nsDTDMode aMode = eDTDMode_autodetect) = 0;
NS_IMETHOD Parse(const nsAString& aSourceBuffer,
void* aKey,
const nsACString& aMimeType,
PRBool aEnableVerify,
PRBool aLastCall,
nsDTDMode aMode = eDTDMode_autodetect) = 0;

2
mozilla/parser/htmlparser/robot/nsDebugRobot.cpp
View File

@@ -306,7 +306,7 @@ extern "C" NS_EXPORT int DebugRobot(
parser->SetContentSink(sink);
g_bReadyForNextUrl = PR_FALSE;
parser->Parse(url, nsnull,PR_TRUE);/* XXX hook up stream listener here! */
parser->Parse(url, nsnull);/* XXX hook up stream listener here! */
while (!g_bReadyForNextUrl) {
if (yieldProc != NULL) {
nsCAutoString spec;

30
mozilla/parser/htmlparser/src/nsParser.cpp
View File

@@ -67,7 +67,6 @@
#include "nsViewSourceHTML.h"
#endif
#define NS_PARSER_FLAG_DTD_VERIFICATION 0x00000001
#define NS_PARSER_FLAG_PARSER_ENABLED 0x00000002
#define NS_PARSER_FLAG_OBSERVERS_ENABLED 0x00000004
#define NS_PARSER_FLAG_PENDING_CONTINUE_EVENT 0x00000008
@@ -1249,7 +1248,6 @@ nsParser::SetCanInterrupt(PRBool aCanInterrupt)
NS_IMETHODIMP
nsParser::Parse(nsIURI* aURL,
nsIRequestObserver* aListener,
PRBool aVerifyEnabled,
void* aKey,
nsDTDMode aMode)
{
@@ -1259,12 +1257,6 @@ nsParser::Parse(nsIURI* aURL,
nsresult result=kBadURL;
mObserver = aListener;
if (aVerifyEnabled) {
mFlags |= NS_PARSER_FLAG_DTD_VERIFICATION;
} else {
mFlags &= ~NS_PARSER_FLAG_DTD_VERIFICATION;
}
if (aURL) {
nsCAutoString spec;
nsresult rv = aURL->GetSpec(spec);
@@ -1304,16 +1296,9 @@ nsParser::Parse(nsIURI* aURL,
NS_IMETHODIMP
nsParser::Parse(nsIInputStream* aStream,
const nsACString& aMimeType,
PRBool aVerifyEnabled,
void* aKey,
nsDTDMode aMode)
{
if (aVerifyEnabled) {
mFlags |= NS_PARSER_FLAG_DTD_VERIFICATION;
} else {
mFlags &= ~NS_PARSER_FLAG_DTD_VERIFICATION;
}
nsresult result = NS_ERROR_OUT_OF_MEMORY;
// Ok, time to create our tokenizer and begin the process
@@ -1353,7 +1338,6 @@ NS_IMETHODIMP
nsParser::Parse(const nsAString& aSourceBuffer,
void* aKey,
const nsACString& aMimeType,
PRBool aVerifyEnabled,
PRBool aLastCall,
nsDTDMode aMode)
{
@@ -1378,12 +1362,6 @@ nsParser::Parse(const nsAString& aSourceBuffer,
nsCOMPtr<nsIParser> kungFuDeathGrip(this);
if (aLastCall || !aSourceBuffer.IsEmpty() || !mUnusedInput.IsEmpty()) {
if (aVerifyEnabled) {
mFlags |= NS_PARSER_FLAG_DTD_VERIFICATION;
} else {
mFlags &= ~NS_PARSER_FLAG_DTD_VERIFICATION;
}
// Note: The following code will always find the parser context associated
// with the given key, even if that context has been suspended (e.g., for
// another document.write call). This doesn't appear to be exactly what IE
@@ -1502,8 +1480,7 @@ nsParser::ParseFragment(const nsAString& aSourceBuffer,
// First, parse the context to build up the DTD's tag stack. Note that we
// pass PR_FALSE for the aLastCall parameter.
result = Parse(theContext, (void*)&theContext, aMimeType,
PR_FALSE, PR_FALSE, aMode);
result = Parse(theContext, (void*)&theContext, aMimeType, PR_FALSE, aMode);
if (NS_FAILED(result)) {
mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED;
return result;
@@ -1552,7 +1529,7 @@ nsParser::ParseFragment(const nsAString& aSourceBuffer,
// Now, parse the actual content. Note that this is the last call for HTML
// content, but for XML, we will want to build and parse the end tags.
result = Parse(aSourceBuffer, (void*)&theContext, aMimeType,
PR_FALSE, !aXMLMode, aMode);
!aXMLMode, aMode);
fragSink->DidBuildContent();
if (aXMLMode && NS_SUCCEEDED(result)) {
@@ -1569,8 +1546,7 @@ nsParser::ParseFragment(const nsAString& aSourceBuffer,
endContext.AppendLiteral(">");
}
result = Parse(endContext, (void*)&theContext, aMimeType,
PR_FALSE, PR_TRUE, aMode);
result = Parse(endContext, (void*)&theContext, aMimeType, PR_TRUE, aMode);
}
mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED;

3
mozilla/parser/htmlparser/src/nsParser.h
View File

@@ -196,7 +196,6 @@ class nsParser : public nsIParser,
*/
NS_IMETHOD Parse(nsIURI* aURL,
nsIRequestObserver* aListener = nsnull,
PRBool aEnableVerify = PR_FALSE,
void* aKey = 0,
nsDTDMode aMode = eDTDMode_autodetect);
@@ -208,7 +207,6 @@ class nsParser : public nsIParser,
*/
NS_IMETHOD Parse(nsIInputStream* aStream,
const nsACString& aMimeType,
PRBool aEnableVerify = PR_FALSE,
void* aKey = 0,
nsDTDMode aMode = eDTDMode_autodetect);
@@ -221,7 +219,6 @@ class nsParser : public nsIParser,
NS_IMETHOD Parse(const nsAString& aSourceBuffer,
void* aKey,
const nsACString& aContentType,
PRBool aEnableVerify,
PRBool aLastCall,
nsDTDMode aMode = eDTDMode_autodetect);

2
mozilla/parser/htmlparser/tests/html/TestParser.cpp
View File

@@ -98,7 +98,7 @@ nsresult ParseData(char* anInputStream,char* anOutputStream) {
sink->SetOutputStream(out);
parser->SetContentSink(sink);
result = parser->Parse(stream, 0, NS_LITERAL_CSTRING("text/html"), PR_FALSE, PR_TRUE);
result = parser->Parse(stream, 0, NS_LITERAL_CSTRING("text/html"), PR_TRUE);
PR_Close(in);
PR_Close(out);

2
mozilla/parser/htmlparser/tests/logparse/logparse.cpp
View File

@@ -101,7 +101,7 @@ nsresult GenerateBaselineFile(const char* aSourceFilename,const char* aBaselineF
// Parse the document, having the sink write the data to fp
parser->SetContentSink(sink);
rv = parser->Parse(inputURI, 0, PR_FALSE, 0, eDTDMode_unknown);
rv = parser->Parse(inputURI, 0, PR_FALSE, eDTDMode_unknown);
return rv;
}

2
mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
View File

@@ -175,7 +175,7 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType,
return NS_ERROR_NOT_IMPLEMENTED;
}
rv = parser->Parse(inString, 0, NS_LossyConvertUCS2toASCII(inType), PR_FALSE, PR_TRUE);
rv = parser->Parse(inString, 0, NS_LossyConvertUCS2toASCII(inType), PR_TRUE);
if (NS_FAILED(rv))
{
printf("Parse() failed! 0x%x\n", rv);