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: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | /* |
michael@0 | 7 | * |
michael@0 | 8 | * Date: 27 Nov 2002 |
michael@0 | 9 | * SUMMARY: Ensuring normal function call of Error (ECMA-262 Ed.3 15.11.1.1). |
michael@0 | 10 | */ |
michael@0 | 11 | //----------------------------------------------------------------------------- |
michael@0 | 12 | var UBound = 0; |
michael@0 | 13 | var BUGNUMBER = ''; |
michael@0 | 14 | var summary = 'Ensuring normal function call of Error (ECMA-262 Ed.3 15.11.1.1)'; |
michael@0 | 15 | var status = ''; |
michael@0 | 16 | var statusitems = []; |
michael@0 | 17 | var actual = ''; |
michael@0 | 18 | var actualvalues = []; |
michael@0 | 19 | var expect= ''; |
michael@0 | 20 | var expectedvalues = []; |
michael@0 | 21 | var EMPTY_STRING = ''; |
michael@0 | 22 | var EXPECTED_FORMAT = 0; |
michael@0 | 23 | |
michael@0 | 24 | |
michael@0 | 25 | function otherScope(msg) |
michael@0 | 26 | { |
michael@0 | 27 | return Error(msg); |
michael@0 | 28 | } |
michael@0 | 29 | |
michael@0 | 30 | |
michael@0 | 31 | status = inSection(1); |
michael@0 | 32 | var err1 = Error('msg1'); |
michael@0 | 33 | actual = examineThis(err1, 'msg1'); |
michael@0 | 34 | expect = EXPECTED_FORMAT; |
michael@0 | 35 | addThis(); |
michael@0 | 36 | |
michael@0 | 37 | status = inSection(2); |
michael@0 | 38 | var err2 = otherScope('msg2'); |
michael@0 | 39 | actual = examineThis(err2, 'msg2'); |
michael@0 | 40 | expect = EXPECTED_FORMAT; |
michael@0 | 41 | addThis(); |
michael@0 | 42 | |
michael@0 | 43 | status = inSection(3); |
michael@0 | 44 | var err3 = otherScope(); |
michael@0 | 45 | actual = examineThis(err3, EMPTY_STRING); |
michael@0 | 46 | expect = EXPECTED_FORMAT; |
michael@0 | 47 | addThis(); |
michael@0 | 48 | |
michael@0 | 49 | status = inSection(4); |
michael@0 | 50 | var err4 = eval("Error('msg4')"); |
michael@0 | 51 | actual = examineThis(err4, 'msg4'); |
michael@0 | 52 | expect = EXPECTED_FORMAT; |
michael@0 | 53 | addThis(); |
michael@0 | 54 | |
michael@0 | 55 | |
michael@0 | 56 | |
michael@0 | 57 | //----------------------------------------------------------------------------- |
michael@0 | 58 | test(); |
michael@0 | 59 | //----------------------------------------------------------------------------- |
michael@0 | 60 | |
michael@0 | 61 | |
michael@0 | 62 | |
michael@0 | 63 | /* |
michael@0 | 64 | * Searches err.toString() for err.name + ':' + err.message, |
michael@0 | 65 | * with possible whitespace on each side of the colon sign. |
michael@0 | 66 | * |
michael@0 | 67 | * We allow for no colon in case err.message was not provided by the user. |
michael@0 | 68 | * In such a case, SpiderMonkey and Rhino currently set err.message = '', |
michael@0 | 69 | * as allowed for by ECMA 15.11.4.3. This makes |pattern| work in this case. |
michael@0 | 70 | * |
michael@0 | 71 | * If this is ever changed to a non-empty string, e.g. 'undefined', |
michael@0 | 72 | * you may have to modify |pattern| to take that into account - |
michael@0 | 73 | * |
michael@0 | 74 | */ |
michael@0 | 75 | function examineThis(err, msg) |
michael@0 | 76 | { |
michael@0 | 77 | var pattern = err.name + '\\s*:?\\s*' + msg; |
michael@0 | 78 | return err.toString().search(RegExp(pattern)); |
michael@0 | 79 | } |
michael@0 | 80 | |
michael@0 | 81 | |
michael@0 | 82 | function addThis() |
michael@0 | 83 | { |
michael@0 | 84 | statusitems[UBound] = status; |
michael@0 | 85 | actualvalues[UBound] = actual; |
michael@0 | 86 | expectedvalues[UBound] = expect; |
michael@0 | 87 | UBound++; |
michael@0 | 88 | } |
michael@0 | 89 | |
michael@0 | 90 | |
michael@0 | 91 | function test() |
michael@0 | 92 | { |
michael@0 | 93 | enterFunc ('test'); |
michael@0 | 94 | printBugNumber(BUGNUMBER); |
michael@0 | 95 | printStatus (summary); |
michael@0 | 96 | |
michael@0 | 97 | for (var i = 0; i < UBound; i++) |
michael@0 | 98 | { |
michael@0 | 99 | reportCompare(expectedvalues[i], actualvalues[i], statusitems[i]); |
michael@0 | 100 | } |
michael@0 | 101 | |
michael@0 | 102 | exitFunc ('test'); |
michael@0 | 103 | } |