Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 541496 part 6: remove no-longer-used stream-processing code from css::Loader and nsCSSParser. r=bzbarsky

Browse Source
This commit is contained in:
Zack Weinberg 2011-05-18 21:22:59 -04:00
parent 97dcf8c409
commit 2f9f710588
4 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/style/Loader.cpp
View File

@ -1528,9 +1528,8 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
* the CSS parser at the data stream. That lets us handle @import
* correctly.
*/
template <typename T>
nsresult
Loader::ParseSheet(T& aInput,
Loader::ParseSheet(const nsAString& aInput,
SheetLoadData* aLoadData,
PRBool& aCompleted)
{

4
layout/style/Loader.h
View File

@ -56,7 +56,6 @@ class nsICSSLoaderObserver;
class nsCSSStyleSheet;
class nsIContent;
class nsIDocument;
class nsIUnicharInputStream;
class nsCSSParser;
class nsMediaList;
@ -443,8 +442,7 @@ private:
// Set aCompleted to true if the parse finished, false otherwise (e.g. if the
// sheet had an @import). If aCompleted is true when this returns, then
// ParseSheet also called SheetComplete on aLoadData.
template <typename T>
nsresult ParseSheet(T& aStream,
nsresult ParseSheet(const nsAString& aInput,
SheetLoadData* aLoadData,
PRBool& aCompleted);

42
layout/style/nsCSSParser.cpp
View File

@ -55,7 +55,6 @@
#include "mozilla/css/ImportRule.h"
#include "nsCSSRules.h"
#include "mozilla/css/NameSpaceRule.h"
#include "nsIUnicharInputStream.h"
#include "nsCSSStyleSheet.h"
#include "mozilla/css/Declaration.h"
#include "nsStyleConsts.h"
@ -203,8 +202,7 @@ public:
// Clears everything set by the above Set*() functions.
void Reset();
template <typename T>
nsresult ParseSheet(T& aInput,
nsresult ParseSheet(const nsAString& aInput,
nsIURI* aSheetURI,
nsIURI* aBaseURI,
nsIPrincipal* aSheetPrincipal,
@ -296,9 +294,6 @@ protected:
CSSParserImpl* mParser;
};
void InitScanner(nsIUnicharInputStream& aInput, nsIURI* aSheetURI,
PRUint32 aLineNumber, nsIURI* aBaseURI,
nsIPrincipal* aSheetPrincipal);
// the caller must hold on to aString until parsing is done
void InitScanner(const nsSubstring& aString, nsIURI* aSheetURI,
PRUint32 aLineNumber, nsIURI* aBaseURI,
@ -836,25 +831,6 @@ CSSParserImpl::Reset()
SetChildLoader(nsnull);
}
void
CSSParserImpl::InitScanner(nsIUnicharInputStream& aInput, nsIURI* aSheetURI,
PRUint32 aLineNumber, nsIURI* aBaseURI,
nsIPrincipal* aSheetPrincipal)
{
NS_ASSERTION(! mScannerInited, "already have scanner");
mScanner.Init(&aInput, nsnull, 0, aSheetURI, aLineNumber, mSheet,
mChildLoader);
#ifdef DEBUG
mScannerInited = PR_TRUE;
#endif
mBaseURI = aBaseURI;
mSheetURI = aSheetURI;
mSheetPrincipal = aSheetPrincipal;
mHavePushBack = PR_FALSE;
}
void
CSSParserImpl::InitScanner(const nsSubstring& aString, nsIURI* aSheetURI,
PRUint32 aLineNumber, nsIURI* aBaseURI,
@ -889,9 +865,8 @@ CSSParserImpl::ReleaseScanner(void)
mSheetPrincipal = nsnull;
}
template <typename T>
nsresult
CSSParserImpl::ParseSheet(T& aInput,
CSSParserImpl::ParseSheet(const nsAString& aInput,
nsIURI* aSheetURI,
nsIURI* aBaseURI,
nsIPrincipal* aSheetPrincipal,
@ -8758,19 +8733,6 @@ nsCSSParser::SetChildLoader(mozilla::css::Loader* aChildLoader)
SetChildLoader(aChildLoader);
}
nsresult
nsCSSParser::ParseSheet(nsIUnicharInputStream& aInput,
nsIURI* aSheetURI,
nsIURI* aBaseURI,
nsIPrincipal* aSheetPrincipal,
PRUint32 aLineNumber,
PRBool aAllowUnsafeRules)
{
return static_cast<CSSParserImpl*>(mImpl)->
ParseSheet(aInput, aSheetURI, aBaseURI, aSheetPrincipal, aLineNumber,
aAllowUnsafeRules);
}
nsresult
nsCSSParser::ParseSheet(const nsAString& aInput,
nsIURI* aSheetURI,

7
layout/style/nsCSSParser.h
View File

@ -49,7 +49,6 @@
class nsCSSStyleSheet;
class nsIPrincipal;
class nsIURI;
class nsIUnicharInputStream;
struct nsCSSSelectorList;
class nsMediaList;
#ifdef MOZ_CSS_ANIMATIONS
@ -113,12 +112,6 @@ public:
* @param aAllowUnsafeRules see aEnableUnsafeRules in
* mozilla::css::Loader::LoadSheetSync
*/
nsresult ParseSheet(nsIUnicharInputStream& aInput,
nsIURI* aSheetURL,
nsIURI* aBaseURI,
nsIPrincipal* aSheetPrincipal,
PRUint32 aLineNumber,
PRBool aAllowUnsafeRules);
nsresult ParseSheet(const nsAString& aInput,
nsIURI* aSheetURL,
nsIURI* aBaseURI,