From cf918fd17af06de6364e214c9f556e2695f10444 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Fri, 1 Jul 2011 00:39:04 -0300
Subject: [PATCH] Bug 668307. Minimum loadURI support for remote content in
 Firefox. r=dao

---
 browser/base/content/browser.js |  2 ++
 browser/base/content/content.js | 47 +++++++++++++++++++++++++++++++++
 browser/base/jar.mn             |  1 +
 3 files changed, 50 insertions(+)
 create mode 100644 browser/base/content/content.js

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 3eef4c519c80..7dca91ee3eb4 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1415,6 +1415,8 @@ function prepareForStartup() {
     return;
   }
 
+  messageManager.loadFrameScript("chrome://browser/content/content.js", true);
+
   // initialize observers and listeners
   // and give C++ access to gBrowser
   gBrowser.init();
diff --git a/browser/base/content/content.js b/browser/base/content/content.js
new file mode 100644
index 000000000000..17cae71de429
--- /dev/null
+++ b/browser/base/content/content.js
@@ -0,0 +1,47 @@
+# -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is multi-process front-end code.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Felipe Gomes <felipc@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+const Ci = Components.interfaces;
+
+const webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
+
+addMessageListener("WebNavigation:LoadURI", function(message) {
+  let flags = message.json.flags || webNavigation.LOAD_FLAGS_NONE;
+
+  webNavigation.loadURI(message.json.uri, flags, null, null, null);
+});
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 59646b1c8eec..cdf66aa4e718 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -29,6 +29,7 @@ browser.jar:
 *       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
+*       content/browser/content.js                    (content/content.js)
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
         content/browser/highlighter.xhtml             (content/highlighter.xhtml)
 *       content/browser/inspector.html                (content/inspector.html)