Bug 566799 - e10s: Make IPC::URI the go-to for all IPC URI action. Part 2. Allow javascript:. r=dougt
authorJosh Matthews <josh@joshmatthews.net>
Tue, 29 Jun 2010 20:58:28 -0700
changeset 46944 17bd6f89d86c3989a7f53746a93e173147f2ab56
parent 46943 59a5b78e9bc08f9252794eb27ba83d181091ec23
child 46945 9cfe0ace0e9588e4cfff87f978e88fe896d0a87d
push id14210
push userdougt@mozilla.com
push dateThu, 01 Jul 2010 06:28:42 +0000
treeherdermozilla-central@3aff97777291 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
bugs566799
milestone2.0b2pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 566799 - e10s: Make IPC::URI the go-to for all IPC URI action. Part 2. Allow javascript:. r=dougt
netwerk/ipc/NeckoMessageUtils.h
--- a/netwerk/ipc/NeckoMessageUtils.h
+++ b/netwerk/ipc/NeckoMessageUtils.h
@@ -79,17 +79,18 @@ struct ParamTraits<URI>
     WriteParam(aMsg, isNull);
     if (isNull)
       return;
     
     nsCOMPtr<nsIIPCSerializable> serializable = do_QueryInterface(aParam.mURI);
     if (!serializable) {
       nsCString scheme;
       aParam.mURI->GetScheme(scheme);
-      NS_ABORT_IF_FALSE(scheme.EqualsASCII("about:"),
+      NS_ABORT_IF_FALSE(scheme.EqualsASCII("about:") ||
+                        scheme.EqualsASCII("javascript:"),
                         "All IPDL URIs must be serializable or an allowed scheme");
     }
     
     bool isSerialized = !!serializable;
     WriteParam(aMsg, isSerialized);
     if (!isSerialized) {
       nsCString spec, charset;
       aParam.mURI->GetSpec(spec);