Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* vim:set ts=2 sw=2 sts=2 et: */ |
michael@0 | 3 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 6 | |
michael@0 | 7 | |
michael@0 | 8 | var bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"]. |
michael@0 | 9 | getService(Ci.nsINavBookmarksService); |
michael@0 | 10 | var hs = Cc["@mozilla.org/browser/nav-history-service;1"]. |
michael@0 | 11 | getService(Ci.nsINavHistoryService); |
michael@0 | 12 | |
michael@0 | 13 | function check_queries_results(aQueries, aOptions, aExpectedItemIds) { |
michael@0 | 14 | var result = hs.executeQueries(aQueries, aQueries.length, aOptions); |
michael@0 | 15 | var root = result.root; |
michael@0 | 16 | root.containerOpen = true; |
michael@0 | 17 | |
michael@0 | 18 | // Dump found nodes. |
michael@0 | 19 | for (let i = 0; i < root.childCount; i++) { |
michael@0 | 20 | dump("nodes[" + i + "]: " + root.getChild(0).title + "\n"); |
michael@0 | 21 | } |
michael@0 | 22 | |
michael@0 | 23 | do_check_eq(root.childCount, aExpectedItemIds.length); |
michael@0 | 24 | for (let i = 0; i < root.childCount; i++) { |
michael@0 | 25 | do_check_eq(root.getChild(i).itemId, aExpectedItemIds[i]); |
michael@0 | 26 | } |
michael@0 | 27 | |
michael@0 | 28 | root.containerOpen = false; |
michael@0 | 29 | } |
michael@0 | 30 | |
michael@0 | 31 | // main |
michael@0 | 32 | function run_test() { |
michael@0 | 33 | var id1 = bs.insertBookmark(bs.bookmarksMenuFolder, uri("http://foo.tld"), |
michael@0 | 34 | bs.DEFAULT_INDEX, "123 0"); |
michael@0 | 35 | var id2 = bs.insertBookmark(bs.bookmarksMenuFolder, uri("http://foo.tld"), |
michael@0 | 36 | bs.DEFAULT_INDEX, "456"); |
michael@0 | 37 | var id3 = bs.insertBookmark(bs.bookmarksMenuFolder, uri("http://foo.tld"), |
michael@0 | 38 | bs.DEFAULT_INDEX, "123 456"); |
michael@0 | 39 | var id4 = bs.insertBookmark(bs.bookmarksMenuFolder, uri("http://foo.tld"), |
michael@0 | 40 | bs.DEFAULT_INDEX, "789 456"); |
michael@0 | 41 | |
michael@0 | 42 | /** |
michael@0 | 43 | * All of the query objects are ORed together. Within a query, all the terms |
michael@0 | 44 | * are ANDed together. See nsINavHistory.idl. |
michael@0 | 45 | */ |
michael@0 | 46 | var queries = []; |
michael@0 | 47 | queries.push(hs.getNewQuery()); |
michael@0 | 48 | queries.push(hs.getNewQuery()); |
michael@0 | 49 | var options = hs.getNewQueryOptions(); |
michael@0 | 50 | options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS; |
michael@0 | 51 | |
michael@0 | 52 | // Test 1 |
michael@0 | 53 | dump("Test searching for 123 OR 789\n"); |
michael@0 | 54 | queries[0].searchTerms = "123"; |
michael@0 | 55 | queries[1].searchTerms = "789"; |
michael@0 | 56 | check_queries_results(queries, options, [id1, id3, id4]); |
michael@0 | 57 | |
michael@0 | 58 | // Test 2 |
michael@0 | 59 | dump("Test searching for 123 OR 456\n"); |
michael@0 | 60 | queries[0].searchTerms = "123"; |
michael@0 | 61 | queries[1].searchTerms = "456"; |
michael@0 | 62 | check_queries_results(queries, options, [id1, id2, id3, id4]); |
michael@0 | 63 | |
michael@0 | 64 | // Test 3 |
michael@0 | 65 | dump("Test searching for 00 OR 789\n"); |
michael@0 | 66 | queries[0].searchTerms = "00"; |
michael@0 | 67 | queries[1].searchTerms = "789"; |
michael@0 | 68 | check_queries_results(queries, options, [id4]); |
michael@0 | 69 | } |