324092 - Allow output handlers to fail

Status: RESOLVED FIXED

(Core :: XSLT, defect)

Description

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Currently all functions on the output handler interface returns void making it impossible for the output handler to fail.

Patch coming up.

Comment 1

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Attachment: Patch to fix

Comment 2

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Attachment: Patch to fix -w

Comment 3

[Peter Van der Beken [:peterv]]

Comment on attachment 209060 [details] [diff] [review]
Patch to fix -w

>Index: xslt/src/xslt/txMozillaXMLOutput.cpp
>===================================================================

>+nsresult
>+txMozillaXMLOutput::endDocument(nsresult aResult)
> {
>-    closePrevious(eCloseElement | eFlushText);
>+    if (NS_FAILED(aResult)) {
>+        if (mNotifier) {
>+            mNotifier->OnTransformEnd(aResult);
>+        }
>+        
>+        return NS_OK;
>+    }
>+
>+    nsresult rv = closePrevious(eCloseElement | eFlushText);
>+    NS_ENSURE_SUCCESS(rv, rv);

Doesn't this need to call OnTransformEnd?

>+
>     // This should really be handled by nsIDocument::Reset
>     if (mCreatingNewDocument && !mHaveTitleElement) {
>         nsCOMPtr<nsIDOMNSDocument> domDoc = do_QueryInterface(mDocument);
>         if (domDoc) {
>             domDoc->SetTitle(EmptyString());
>         }
>     }
> 
>@@ -221,29 +238,32 @@ void txMozillaXMLOutput::endDocument(nsr
>             if (refURI) {
>                 refURI->SetupRefreshURIFromHeader(doc->GetBaseURI(),
>                                                   mRefreshString);
>             }
>         }
>     }
> 
>     if (mNotifier) {
>-        mNotifier->OnTransformEnd(aResult);
>+        mNotifier->OnTransformEnd();



> txTransformNotifier::AddScriptElement(nsIScriptElement* aElement)
> {
>-    mScriptElements.AppendObject(aElement);
>+    return mScriptElements.AppendObject(aElement) ? NS_OK
>+        : NS_ERROR_OUT_OF_MEMORY;

    return mScriptElements.AppendObject(aElement) ? NS_OK :
                                                    NS_ERROR_OUT_OF_MEMORY;

> txTransformNotifier::AddStyleSheet(nsIStyleSheet* aStyleSheet)
> {
>-    mStylesheets.AppendObject(aStyleSheet);
>+    return mStylesheets.AppendObject(aStyleSheet) ? NS_OK
>+        : NS_ERROR_OUT_OF_MEMORY;

    return mStylesheets.AppendObject(aStyleSheet) ? NS_OK :
                                                    NS_ERROR_OUT_OF_MEMORY;

Comment 4

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

This was fixed long ago

Comment 5

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

This was fixed long ago.