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: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- |
michael@0 | 2 | * |
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 | #include "mozilla/ModuleUtils.h" |
michael@0 | 8 | #include "nsIServiceManager.h" |
michael@0 | 9 | #include "nsXPIDLString.h" |
michael@0 | 10 | |
michael@0 | 11 | #include "nsEmbedCID.h" |
michael@0 | 12 | |
michael@0 | 13 | #include "nsWebBrowser.h" |
michael@0 | 14 | #include "nsCommandHandler.h" |
michael@0 | 15 | #include "nsWebBrowserContentPolicy.h" |
michael@0 | 16 | |
michael@0 | 17 | // Factory Constructors |
michael@0 | 18 | |
michael@0 | 19 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowser) |
michael@0 | 20 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserContentPolicy) |
michael@0 | 21 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandHandler) |
michael@0 | 22 | |
michael@0 | 23 | NS_DEFINE_NAMED_CID(NS_WEBBROWSER_CID); |
michael@0 | 24 | NS_DEFINE_NAMED_CID(NS_COMMANDHANDLER_CID); |
michael@0 | 25 | NS_DEFINE_NAMED_CID(NS_WEBBROWSERCONTENTPOLICY_CID); |
michael@0 | 26 | |
michael@0 | 27 | static const mozilla::Module::CIDEntry kWebBrowserCIDs[] = { |
michael@0 | 28 | { &kNS_WEBBROWSER_CID, false, nullptr, nsWebBrowserConstructor }, |
michael@0 | 29 | { &kNS_COMMANDHANDLER_CID, false, nullptr, nsCommandHandlerConstructor }, |
michael@0 | 30 | { &kNS_WEBBROWSERCONTENTPOLICY_CID, false, nullptr, nsWebBrowserContentPolicyConstructor }, |
michael@0 | 31 | { nullptr } |
michael@0 | 32 | }; |
michael@0 | 33 | |
michael@0 | 34 | static const mozilla::Module::ContractIDEntry kWebBrowserContracts[] = { |
michael@0 | 35 | { NS_WEBBROWSER_CONTRACTID, &kNS_WEBBROWSER_CID }, |
michael@0 | 36 | { NS_COMMANDHANDLER_CONTRACTID, &kNS_COMMANDHANDLER_CID }, |
michael@0 | 37 | { NS_WEBBROWSERCONTENTPOLICY_CONTRACTID, &kNS_WEBBROWSERCONTENTPOLICY_CID }, |
michael@0 | 38 | { nullptr } |
michael@0 | 39 | }; |
michael@0 | 40 | |
michael@0 | 41 | static const mozilla::Module::CategoryEntry kWebBrowserCategories[] = { |
michael@0 | 42 | { "content-policy", NS_WEBBROWSERCONTENTPOLICY_CONTRACTID, NS_WEBBROWSERCONTENTPOLICY_CONTRACTID }, |
michael@0 | 43 | { nullptr } |
michael@0 | 44 | }; |
michael@0 | 45 | |
michael@0 | 46 | static const mozilla::Module kWebBrowserModule = { |
michael@0 | 47 | mozilla::Module::kVersion, |
michael@0 | 48 | kWebBrowserCIDs, |
michael@0 | 49 | kWebBrowserContracts, |
michael@0 | 50 | kWebBrowserCategories |
michael@0 | 51 | }; |
michael@0 | 52 | |
michael@0 | 53 | NSMODULE_DEFN(Browser_Embedding_Module) = &kWebBrowserModule; |
michael@0 | 54 | |
michael@0 | 55 | |
michael@0 | 56 |