wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 913734 - Remove namespace mozilla::hotness. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2013-12-13 19:15:44 -08:00
parent 32bf54415f
commit 913b0c0c51
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caps/include/DomainPolicy.h
View File

@ -13,11 +13,6 @@
namespace mozilla {
// The name "DomainPolicy" conflicts with some of the old-style policy machinery
// in nsScriptSecurityManager.cpp, which needs to #include this file. So we
// temporarily use a sub-namespace until that machinery goes away in bug 913734.
namespace hotness {
class DomainPolicy : public nsIDomainPolicy
{
public:
@ -46,7 +41,6 @@ protected:
nsTHashtable<nsURIHashKey> mHashTable;
};
} /* namespace hotness */
} /* namespace mozilla */
#endif /* DomainPolicy_h__ */

2
caps/src/DomainPolicy.cpp
View File

@ -8,7 +8,6 @@
#include "nsScriptSecurityManager.h"
namespace mozilla {
namespace hotness {
NS_IMPL_ISUPPORTS1(DomainPolicy, nsIDomainPolicy)
@ -161,5 +160,4 @@ DomainSet::ContainsSuperDomain(nsIURI* aDomain, bool* aContains)
}
} /* namespace hotness */
} /* namespace mozilla */

2
caps/src/nsScriptSecurityManager.cpp
View File

@ -1959,7 +1959,7 @@ nsScriptSecurityManager::ActivateDomainPolicy(nsIDomainPolicy** aRv)
return NS_ERROR_SERVICE_NOT_AVAILABLE;
}
mDomainPolicy = new mozilla::hotness::DomainPolicy();
mDomainPolicy = new DomainPolicy();
nsCOMPtr<nsIDomainPolicy> ptr = mDomainPolicy;
ptr.forget(aRv);
return NS_OK;