Use NS_LITERAL_STRING instead of NS_ConvertASCIItoUCS2 where possible
(i.e. where the string is a literal). Bug 104159, r=jag, sr=alecf git-svn-id: svn://10.0.0.236/trunk@107987 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -149,7 +149,7 @@ public:
|
||||
nsHTMLFrameOuterFrame();
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
#endif
|
||||
|
||||
// nsISupports
|
||||
@@ -215,7 +215,7 @@ public:
|
||||
NS_DECL_NSIWEBPROGRESSLISTENER
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
#endif
|
||||
|
||||
NS_IMETHOD GetFrameType(nsIAtom** aType) const;
|
||||
@@ -456,9 +456,9 @@ nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext,
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHODIMP nsHTMLFrameOuterFrame::GetFrameName(nsString& aResult) const
|
||||
NS_IMETHODIMP nsHTMLFrameOuterFrame::GetFrameName(nsAString& aResult) const
|
||||
{
|
||||
return MakeFrameName("FrameOuter", aResult);
|
||||
return MakeFrameName(NS_LITERAL_STRING("FrameOuter"), aResult);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -908,9 +908,9 @@ nsHTMLFrameInnerFrame::OnSecurityChange(nsIWebProgress *aWebProgress,
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHODIMP nsHTMLFrameInnerFrame::GetFrameName(nsString& aResult) const
|
||||
NS_IMETHODIMP nsHTMLFrameInnerFrame::GetFrameName(nsAString& aResult) const
|
||||
{
|
||||
return MakeFrameName("FrameInner", aResult);
|
||||
return MakeFrameName(NS_LITERAL_STRING("FrameInner"), aResult);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1235,7 +1235,7 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext)
|
||||
GetURL(parentContent, url);
|
||||
url.Trim(" \t\n\r");
|
||||
if (url.IsEmpty()) // Load about:blank into a frame if not URL is specified (bug 35986)
|
||||
url = NS_ConvertASCIItoUCS2("about:blank");
|
||||
url = NS_LITERAL_STRING("about:blank");
|
||||
|
||||
// Make an absolute URL
|
||||
nsCOMPtr<nsIURI> baseURL;
|
||||
|
||||
Reference in New Issue
Block a user