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 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 3 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 4 | |
michael@0 | 5 | |
michael@0 | 6 | load(libdir + "../../tests/ecma_6/shell.js"); |
michael@0 | 7 | |
michael@0 | 8 | if (typeof assertWarning === 'undefined') { |
michael@0 | 9 | var assertWarning = function assertWarning(f, errorClass, msg) { |
michael@0 | 10 | var hadWerror = options().split(",").indexOf("werror") !== -1; |
michael@0 | 11 | |
michael@0 | 12 | // Ensure the "werror" option is disabled. |
michael@0 | 13 | if (hadWerror) |
michael@0 | 14 | options("werror"); |
michael@0 | 15 | |
michael@0 | 16 | try { |
michael@0 | 17 | f(); |
michael@0 | 18 | } catch (exc) { |
michael@0 | 19 | if (hadWerror) |
michael@0 | 20 | options("werror"); |
michael@0 | 21 | |
michael@0 | 22 | // print() rather than throw a different exception value, in case |
michael@0 | 23 | // the caller wants exc.stack. |
michael@0 | 24 | if (msg) |
michael@0 | 25 | print("assertWarning: " + msg); |
michael@0 | 26 | print("assertWarning: Unexpected exception calling " + f + |
michael@0 | 27 | " with warnings-as-errors disabled"); |
michael@0 | 28 | throw exc; |
michael@0 | 29 | } |
michael@0 | 30 | |
michael@0 | 31 | // Enable the "werror" option. |
michael@0 | 32 | options("werror"); |
michael@0 | 33 | |
michael@0 | 34 | try { |
michael@0 | 35 | assertThrowsInstanceOf(f, errorClass, msg); |
michael@0 | 36 | } catch (exc) { |
michael@0 | 37 | if (msg) |
michael@0 | 38 | print("assertWarning: " + msg); |
michael@0 | 39 | throw exc; |
michael@0 | 40 | } finally { |
michael@0 | 41 | if (!hadWerror) |
michael@0 | 42 | options("werror"); |
michael@0 | 43 | } |
michael@0 | 44 | }; |
michael@0 | 45 | } |
michael@0 | 46 | |
michael@0 | 47 | if (typeof assertNoWarning === 'undefined') { |
michael@0 | 48 | var assertNoWarning = function assertWarning(f, msg) { |
michael@0 | 49 | // Ensure the "werror" option is enabled. |
michael@0 | 50 | var hadWerror = options().split(",").indexOf("werror") !== -1; |
michael@0 | 51 | if (!hadWerror) |
michael@0 | 52 | options("werror"); |
michael@0 | 53 | |
michael@0 | 54 | try { |
michael@0 | 55 | f(); |
michael@0 | 56 | } catch (exc) { |
michael@0 | 57 | if (msg) |
michael@0 | 58 | print("assertNoWarning: " + msg); |
michael@0 | 59 | print("assertNoWarning: Unexpected exception calling " + f + |
michael@0 | 60 | "with warnings-as-errors enabled"); |
michael@0 | 61 | throw exc; |
michael@0 | 62 | } finally { |
michael@0 | 63 | if (!hadWerror) |
michael@0 | 64 | options("werror"); |
michael@0 | 65 | } |
michael@0 | 66 | }; |
michael@0 | 67 | } |