From fed2ce07ee7de282abaecf274f8987f65f4c5893 Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Fri, 11 Dec 1998 02:46:25 +0000 Subject: [PATCH] fixed base href for inline style sheets set case sensativity in CSS parser git-svn-id: svn://10.0.0.236/trunk@16213 18797224-902f-48f8-a5cc-f745e15eee43 --- .../html/document/src/nsHTMLContentSink.cpp | 14 ++++++++++++-- .../layout/html/document/src/nsHTMLContentSink.cpp | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index d3c30064804..bf3704b535d 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -2411,8 +2411,17 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode) } // Use the document's url since the style data came from there - url = mDocumentURL; - NS_IF_ADDREF(url); + if (0 < mBaseHREF.Length()) { // use base URL + rv = NS_NewURL(&url, mBaseHREF); + if (NS_FAILED(rv)) { + url = mDocumentURL; + NS_IF_ADDREF(url); + } + } + else { + url = mDocumentURL; + NS_IF_ADDREF(url); + } } else { // src with immediate style data doesn't add up // XXX what does nav do? @@ -2540,6 +2549,7 @@ HTMLContentSink::LoadStyleSheet(nsIURL* aURL, nsICSSStyleSheet* sheet = nsnull; // XXX note: we are ignoring rv until the error code stuff in the // input routines is converted to use nsresult's + parser->SetCaseSensative(PR_FALSE); parser->Parse(aUIN, aURL, sheet); if (nsnull != sheet) { sheet->SetTitle(aTitle); diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index d3c30064804..bf3704b535d 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -2411,8 +2411,17 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode) } // Use the document's url since the style data came from there - url = mDocumentURL; - NS_IF_ADDREF(url); + if (0 < mBaseHREF.Length()) { // use base URL + rv = NS_NewURL(&url, mBaseHREF); + if (NS_FAILED(rv)) { + url = mDocumentURL; + NS_IF_ADDREF(url); + } + } + else { + url = mDocumentURL; + NS_IF_ADDREF(url); + } } else { // src with immediate style data doesn't add up // XXX what does nav do? @@ -2540,6 +2549,7 @@ HTMLContentSink::LoadStyleSheet(nsIURL* aURL, nsICSSStyleSheet* sheet = nsnull; // XXX note: we are ignoring rv until the error code stuff in the // input routines is converted to use nsresult's + parser->SetCaseSensative(PR_FALSE); parser->Parse(aUIN, aURL, sheet); if (nsnull != sheet) { sheet->SetTitle(aTitle);