From 8a0a62255c4ea336cec4ff06644417cb0b0c3cee Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sun, 30 Sep 2001 23:48:07 +0000 Subject: [PATCH] Final removal of VIEW_SOURCE_HTML define. Bug 81132, r=rbs@maths.uq.edu.au, sr=jst git-svn-id: svn://10.0.0.236/trunk@104274 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/build/nsContentDLF.cpp | 13 ------------- mozilla/layout/build/nsContentDLF.cpp | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/mozilla/content/build/nsContentDLF.cpp b/mozilla/content/build/nsContentDLF.cpp index 2715de9a862..5fda108622a 100644 --- a/mozilla/content/build/nsContentDLF.cpp +++ b/mozilla/content/build/nsContentDLF.cpp @@ -56,8 +56,6 @@ #include "nsIXULContentSink.h" #include "nsIDocStreamLoaderFactory.h" -#define VIEW_SOURCE_HTML - // URL for the "user agent" style sheet #define UA_CSS_URL "resource:/res/ua.css" @@ -206,23 +204,12 @@ nsContentDLF::CreateInstance(const char* aCommand, } if(0==PL_strcmp(aCommand,"view-source")) { -#ifdef VIEW_SOURCE_HTML NS_ENSURE_ARG(aChannel); // It's a view-source. Reset channel's content type to the original // type so as not to choke the parser when it asks the channel // for the content type during the parse phase aChannel->SetContentType(aContentType); aContentType=gHTMLTypes[0]; -#else - if(0==PL_strcmp(aContentType,gHTMLTypes[1])) { - aContentType=gHTMLTypes[0]; - } - else if(0==PL_strcmp(aContentType,gHTMLTypes[2])) { - aContentType=gHTMLTypes[0]; - } - else - aContentType=gXMLTypes[0]; -#endif } // Try html diff --git a/mozilla/layout/build/nsContentDLF.cpp b/mozilla/layout/build/nsContentDLF.cpp index 2715de9a862..5fda108622a 100644 --- a/mozilla/layout/build/nsContentDLF.cpp +++ b/mozilla/layout/build/nsContentDLF.cpp @@ -56,8 +56,6 @@ #include "nsIXULContentSink.h" #include "nsIDocStreamLoaderFactory.h" -#define VIEW_SOURCE_HTML - // URL for the "user agent" style sheet #define UA_CSS_URL "resource:/res/ua.css" @@ -206,23 +204,12 @@ nsContentDLF::CreateInstance(const char* aCommand, } if(0==PL_strcmp(aCommand,"view-source")) { -#ifdef VIEW_SOURCE_HTML NS_ENSURE_ARG(aChannel); // It's a view-source. Reset channel's content type to the original // type so as not to choke the parser when it asks the channel // for the content type during the parse phase aChannel->SetContentType(aContentType); aContentType=gHTMLTypes[0]; -#else - if(0==PL_strcmp(aContentType,gHTMLTypes[1])) { - aContentType=gHTMLTypes[0]; - } - else if(0==PL_strcmp(aContentType,gHTMLTypes[2])) { - aContentType=gHTMLTypes[0]; - } - else - aContentType=gXMLTypes[0]; -#endif } // Try html