Bug 1441964 - [1.0] Return URI-load delegation success state instead of throwing. r=snorp

2018-02-28 00:24:52 +01:00
parent a3358e1a84
commit 8ae32ed789
3 changed files with 6 additions and 6 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9648,8 +9648,10 @@ nsDocShell::InternalLoad(nsIURI* aURI,
      return NS_ERROR_DOM_INVALID_ACCESS_ERR;
    }

-    if (NS_SUCCEEDED(mLoadURIDelegate->LoadURI(aURI, where, aFlags,
-                                               aTriggeringPrincipal))) {
+    bool loadURIHandled = false;
+    rv = mLoadURIDelegate->LoadURI(aURI, where, aFlags, aTriggeringPrincipal,
+                                   &loadURIHandled);
+    if (NS_SUCCEEDED(rv) && loadURIHandled) {
      // The request has been handled, nothing to do here.
      return NS_OK;
    }