1217307 - Remove some unnecessary null checks in dom/

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Biru [:poiru]]

These patches have been gathering dust for a few months. I lost a bunch of hunks because I didn't feel like resolving so many conflicts, but this is better than nothing.

Comment 1

[Biru [:poiru]]

Attachment: Remove some unnecessary null checks in dom/base/

Comment 2

[Biru [:poiru]]

Attachment: Remove some unnecessary null checks in dom/xslt/

Comment 3

[Biru [:poiru]]

Attachment: Remove some unnecessary null checks in rest of dom/xul/

Comment 4

[Biru [:poiru]]

Attachment: Remove some unnecessary null checks in rest of dom/

Comment 5

[Nicholas Nethercote [inactive]]

Comment on attachment 8677272 [details] [diff] [review]
Remove some unnecessary null checks in dom/xslt/

Review of attachment 8677272 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/xslt/xpath/txNodeSetAdaptor.cpp
@@ +25,5 @@
>  {
>      if (!mValue) {
>          mValue = new txNodeSet(nullptr);
>      }
> +    return NS_OK;

Bonus points if you change the return type of this function to |void| and avoid additional redundant checks up the call chain.

::: dom/xslt/xpath/txXPCOMExtensionFunction.cpp
@@ +255,5 @@
>  #ifdef TX_TO_STRING
>                                                    aName,
>  #endif
>                                                    aState);
> +    return NS_OK;

Ditto.

::: dom/xslt/xslt/txStylesheetCompiler.cpp
@@ +1086,5 @@
>      nsresult rv = findFunction(aName, aID, this, aFunction);
>      if (rv == NS_ERROR_XPATH_UNKNOWN_FUNCTION &&
>          (aID != kNameSpaceID_None || fcp())) {
>          *aFunction = new txErrorFunctionCall(aName);
> +        rv = NS_OK;

Ditto.

::: dom/xslt/xslt/txXSLTNumberCounters.cpp
@@ +97,5 @@
>          // if we don't recognize the token then use '1'
>          aCounter = new txDecimalCounter(1, aGroupSize, aGroupSeparator);
>      }
> +    MOZ_ASSERT(aCounter);
> +    return NS_OK;

Ditto.

Comment 6

[Nicholas Nethercote [inactive]]

Comment on attachment 8677275 [details] [diff] [review]
Remove some unnecessary null checks in rest of dom/

Review of attachment 8677275 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/plugins/base/nsPluginNativeWindow.cpp
@@ +40,5 @@
>  nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow)
>  {
>    NS_ENSURE_ARG_POINTER(aPluginNativeWindow);
>    *aPluginNativeWindow = new nsPluginNativeWindowPLATFORM();
> +  return NS_OK;

Can you now change the return type of this function to |void|? Maybe; I haven't checked all the instances to see if any can return something other than NS_OK.

Comment 7

[Nicholas Nethercote [inactive]]

Nice changes. Thank you for persevering.

Comment 8

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/66eba1425dbe
https://hg.mozilla.org/integration/mozilla-inbound/rev/f05d1adcc902
https://hg.mozilla.org/integration/mozilla-inbound/rev/7924b7209be3
https://hg.mozilla.org/integration/mozilla-inbound/rev/8f9c8e490cab

Comment 9

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/66eba1425dbe
https://hg.mozilla.org/mozilla-central/rev/f05d1adcc902
https://hg.mozilla.org/mozilla-central/rev/7924b7209be3
https://hg.mozilla.org/mozilla-central/rev/8f9c8e490cab