Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
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 | #ifndef nsMixedContentBlocker_h___ |
michael@0 | 7 | #define nsMixedContentBlocker_h___ |
michael@0 | 8 | |
michael@0 | 9 | #define NS_MIXEDCONTENTBLOCKER_CONTRACTID "@mozilla.org/mixedcontentblocker;1" |
michael@0 | 10 | /* daf1461b-bf29-4f88-8d0e-4bcdf332c862 */ |
michael@0 | 11 | #define NS_MIXEDCONTENTBLOCKER_CID \ |
michael@0 | 12 | { 0xdaf1461b, 0xbf29, 0x4f88, \ |
michael@0 | 13 | { 0x8d, 0x0e, 0x4b, 0xcd, 0xf3, 0x32, 0xc8, 0x62 } } |
michael@0 | 14 | |
michael@0 | 15 | // This enum defines type of content that is detected when an |
michael@0 | 16 | // nsMixedContentEvent fires |
michael@0 | 17 | enum MixedContentTypes { |
michael@0 | 18 | // "Active" content, such as fonts, plugin content, JavaScript, stylesheets, |
michael@0 | 19 | // iframes, WebSockets, and XHR |
michael@0 | 20 | eMixedScript, |
michael@0 | 21 | // "Display" content, such as images, audio, video, and <a ping> |
michael@0 | 22 | eMixedDisplay |
michael@0 | 23 | }; |
michael@0 | 24 | |
michael@0 | 25 | #include "nsIContentPolicy.h" |
michael@0 | 26 | |
michael@0 | 27 | class nsMixedContentBlocker : public nsIContentPolicy |
michael@0 | 28 | { |
michael@0 | 29 | public: |
michael@0 | 30 | NS_DECL_ISUPPORTS |
michael@0 | 31 | NS_DECL_NSICONTENTPOLICY |
michael@0 | 32 | |
michael@0 | 33 | nsMixedContentBlocker(); |
michael@0 | 34 | virtual ~nsMixedContentBlocker(); |
michael@0 | 35 | static bool sBlockMixedScript; |
michael@0 | 36 | static bool sBlockMixedDisplay; |
michael@0 | 37 | }; |
michael@0 | 38 | |
michael@0 | 39 | #endif /* nsMixedContentBlocker_h___ */ |