230591 - [FIX] a bit more random XBL cleanup

Status: RESOLVED FIXED

(Core :: XBL, defect)

Description

[Boris Zbarsky [:bzbarsky]]

Comment 1

[Boris Zbarsky [:bzbarsky]]

Attachment: Patch

Comment 2

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 138771 [details] [diff] [review]
Patch

bryner, would you review?

Comment 3

[Brian Ryner (not reading)]

Comment on attachment 138771 [details] [diff] [review]
Patch

>Index: content/xbl/src/nsXBLPrototypeResources.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLPrototypeResources.cpp,v
>retrieving revision 1.10
>diff -u -p -d -u -1 -0 -r1.10 nsXBLPrototypeResources.cpp
>--- content/xbl/src/nsXBLPrototypeResources.cpp	7 Jan 2004 22:30:40 -0000	1.10
>+++ content/xbl/src/nsXBLPrototypeResources.cpp	10 Jan 2004 22:56:58 -0000
>@@ -100,59 +99,56 @@ static PRBool IsChromeURI(nsIURI* aURI)
> {
>   PRBool isChrome=PR_FALSE;
>   if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome)
>     return PR_TRUE;
>   return PR_FALSE;
> }
> 
> nsresult
> nsXBLPrototypeResources::FlushSkinSheets()
> {
>-  if (!mStyleSheetList)
>+  if (mStyleSheetList.Count() == 0)
>     return NS_OK;
> 
>+  nsresult rv;
>+  // XXXbz should be getting loader off the document or something
>+  nsCOMPtr<nsICSSLoader> loader = do_CreateInstance(kCSSLoaderCID, &rv);
>+  if (NS_FAILED(rv) || !loader) return rv;
>+  

do_CreateInstance will never return success and a null pointer, will it?

r+sr=bryner other than that.

Comment 4

[Boris Zbarsky [:bzbarsky]]

Fixed, with that change.