The inclusions were removed with the following very crude script and the
resulting breakage was fixed up by hand. The manual fixups did either
revert the changes done by the script, replace a generic header with a more
specific one or replace a header with a forward declaration.
find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do
interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2)
if [ -n "$interfaces" ]; then
if [[ "$interfaces" == *$'\n'* ]]; then
regexp="\("
for i in $interfaces; do regexp="$regexp$i\|"; done
regexp="${regexp%%\\\|}\)"
else
regexp="$interfaces"
fi
interface=$(basename "$path")
rg -l "#include.*${interface%%.idl}.h" . | while read path2; do
hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" )
if [ $hits -eq 0 ]; then
echo "Removing ${interface} from ${path2}"
grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp
mv -f "$path2".tmp "$path2"
fi
done
fi
done
Differential Revision: https://phabricator.services.mozilla.com/D55444
68 lines
1.5 KiB
C++
68 lines
1.5 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 nsUrlClassifierInfo_h_
|
|
#define nsUrlClassifierInfo_h_
|
|
|
|
#include "nsIUrlClassifierInfo.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsString.h"
|
|
#include "nsTArray.h"
|
|
|
|
class nsUrlClassifierPositiveCacheEntry final
|
|
: public nsIUrlClassifierPositiveCacheEntry {
|
|
public:
|
|
nsUrlClassifierPositiveCacheEntry();
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIURLCLASSIFIERPOSITIVECACHEENTRY
|
|
|
|
private:
|
|
~nsUrlClassifierPositiveCacheEntry() {}
|
|
|
|
public:
|
|
nsCString fullhash;
|
|
|
|
int64_t expirySec;
|
|
};
|
|
|
|
class nsUrlClassifierCacheEntry final : public nsIUrlClassifierCacheEntry {
|
|
public:
|
|
nsUrlClassifierCacheEntry();
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIURLCLASSIFIERCACHEENTRY
|
|
|
|
private:
|
|
~nsUrlClassifierCacheEntry() {}
|
|
|
|
public:
|
|
nsCString prefix;
|
|
|
|
int64_t expirySec;
|
|
|
|
nsTArray<nsCOMPtr<nsIUrlClassifierPositiveCacheEntry>> matches;
|
|
};
|
|
|
|
class nsUrlClassifierCacheInfo final : public nsIUrlClassifierCacheInfo {
|
|
public:
|
|
nsUrlClassifierCacheInfo();
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIURLCLASSIFIERCACHEINFO
|
|
|
|
private:
|
|
~nsUrlClassifierCacheInfo() {}
|
|
|
|
public:
|
|
nsCString table;
|
|
|
|
nsTArray<nsCOMPtr<nsIUrlClassifierCacheEntry>> entries;
|
|
};
|
|
|
|
#endif // nsUrlClassifierInfo_h_
|