author Gerald Squelart <gsquelart@mozilla.com>
Tue, 08 Nov 2016 15:12:33 +1100
changeset 435725 1185cf870e8681261b9ae9360aa5240605a94d9f
parent 253933 8bc7561d75577b08ae0c5449104378144a6fc9e0
child 489668 cbb8fdf1daf98a15f7d57f6b08d273bdf96aa1a0
child 659502 98158d00844cfc0d0a1092d3c1d3373cf55a70e3
permissions -rw-r--r--
Bug 1316206 - Make RefPtr(decltype(nullptr)) MOZ_IMPLICIT - r?froydnj Making this constructor non-explicit will permit automatic conversions from 'nullptr' into RefPtr types, which I think are not dangerous. The one spot that this affects is in 'UserDataType nsBaseHashtable::Get(KeyType)', which does a 'return 0;' into the UserDataType, which could be a bool, an int, a RefPtr or other. I'm changing that into a C++11 "value initialization", which falls back to "zero initialization" for PODs: 'return UserDataType{};'. MozReview-Commit-ID: F41VlvTNOZU

/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef nsContentBlocker_h__
#define nsContentBlocker_h__

#include "nsIContentPolicy.h"
#include "nsIObserver.h"
#include "nsWeakReference.h"
#include "nsIPermissionManager.h"
#include "nsIPrefBranch.h"
#include "mozilla/Attributes.h"

class nsIPrefBranch;


class nsContentBlocker final : public nsIContentPolicy,
                               public nsIObserver,
                               public nsSupportsWeakReference

  // nsISupports

  nsresult Init();

  ~nsContentBlocker() {}

  void PrefChanged(nsIPrefBranch *, const char *);
  nsresult TestPermission(nsIURI *aCurrentURI,
                          nsIURI *aFirstURI,
                          int32_t aContentType,
                          bool *aPermission,
                          bool *aFromPrefs);

  nsCOMPtr<nsIPermissionManager> mPermissionManager;
  nsCOMPtr<nsIPrefBranch> mPrefBranchInternal;
  static uint8_t mBehaviorPref[];

{ 0x4ca6b67b, 0x5cc7, 0x4e71, \
  { 0xa9, 0x8a, 0x97, 0xaf, 0x1c, 0x13, 0x48, 0x62 } }

#define NS_CONTENTBLOCKER_CONTRACTID "@mozilla.org/permissions/contentblocker;1"

#endif /* nsContentBlocker_h__ */