Bug 420331 - wyciwyg: uris show up in location bar (r=mardak)
authorDietrich Ayala <dietrich@mozilla.com>
Mon, 29 Sep 2008 23:46:52 -0700
changeset 19906 3db262c66623e793bed49db9190fca800849fc23
parent 19905 dd633cd932529abec99848555fd469ac14fb04ae
child 19907 7d2bb64668b0f83ef2b7ade4b45f85a3fe100829
push id2535
push userdietrich@mozilla.com
push dateTue, 30 Sep 2008 06:47:17 +0000
treeherdermozilla-central@3db262c66623 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmardak
bugs420331
milestone1.9.1b1pre
Bug 420331 - wyciwyg: uris show up in location bar (r=mardak)
toolkit/components/places/src/nsNavHistory.cpp
toolkit/components/places/tests/unit/test_420331_wyciwyg.js
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -2459,17 +2459,18 @@ nsNavHistory::CanAddURI(nsIURI* aURI, PR
   // now check for all bad things
   if (scheme.EqualsLiteral("about") ||
       scheme.EqualsLiteral("imap") ||
       scheme.EqualsLiteral("news") ||
       scheme.EqualsLiteral("mailbox") ||
       scheme.EqualsLiteral("moz-anno") ||
       scheme.EqualsLiteral("view-source") ||
       scheme.EqualsLiteral("chrome") ||
-      scheme.EqualsLiteral("data")) {
+      scheme.EqualsLiteral("data") ||
+      scheme.EqualsLiteral("wyciwyg")) {
     *canAdd = PR_FALSE;
     return NS_OK;
   }
   *canAdd = PR_TRUE;
   return NS_OK;
 }
 
 // nsNavHistory::AddVisit
new file mode 100644
--- /dev/null
+++ b/toolkit/components/places/tests/unit/test_420331_wyciwyg.js
@@ -0,0 +1,57 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Dietrich Ayala <dietrich@mozilla.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 ***** */
+
+function run_test() {
+  var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
+                getService(Ci.nsINavHistoryService);
+  var testURI = uri("wyciwyg://nodontjudgeabookbyitscover");
+
+  var placeID = histsvc.addVisit(testURI,
+                                 Date.now() * 1000,
+                                 null,
+                                 histsvc.TRANSITION_LINK,
+                                 false, // not redirect
+                                 0);
+  do_check_false(placeID > 0);
+
+  // test codepath of docshell caller
+  histsvc.QueryInterface(Ci.nsIGlobalHistory2);
+  placeID = histsvc.addURI(testURI, false, false, null);
+  do_check_false(placeID > 0);
+}