зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1599843 - nsJSProtocolHandler construction should be simpler. r=bzbarsky
Differential Revision: https://phabricator.services.mozilla.com/D54981 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
c7251caeed
Коммит
54400ca93c
|
@ -1043,28 +1043,12 @@ bool nsJSChannel::GetIsDocumentLoad() {
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
nsJSProtocolHandler::nsJSProtocolHandler() {}
|
||||
nsJSProtocolHandler::nsJSProtocolHandler() = default;
|
||||
|
||||
nsresult nsJSProtocolHandler::Init() { return NS_OK; }
|
||||
|
||||
nsJSProtocolHandler::~nsJSProtocolHandler() {}
|
||||
nsJSProtocolHandler::~nsJSProtocolHandler() = default;
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsJSProtocolHandler, nsIProtocolHandler)
|
||||
|
||||
nsresult nsJSProtocolHandler::Create(nsISupports* aOuter, REFNSIID aIID,
|
||||
void** aResult) {
|
||||
if (aOuter) return NS_ERROR_NO_AGGREGATION;
|
||||
|
||||
nsJSProtocolHandler* ph = new nsJSProtocolHandler();
|
||||
NS_ADDREF(ph);
|
||||
nsresult rv = ph->Init();
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
rv = ph->QueryInterface(aIID, aResult);
|
||||
}
|
||||
NS_RELEASE(ph);
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* static */ nsresult nsJSProtocolHandler::EnsureUTF8Spec(
|
||||
const nsCString& aSpec, const char* aCharset, nsACString& aUTF8Spec) {
|
||||
aUTF8Spec.Truncate();
|
||||
|
|
|
@ -49,10 +49,6 @@ class nsJSProtocolHandler : public nsIProtocolHandler {
|
|||
// nsJSProtocolHandler methods:
|
||||
nsJSProtocolHandler();
|
||||
|
||||
static nsresult Create(nsISupports* aOuter, REFNSIID aIID, void** aResult);
|
||||
|
||||
nsresult Init();
|
||||
|
||||
static nsresult CreateNewURI(const nsACString& aSpec, const char* aCharset,
|
||||
nsIURI* aBaseURI, nsIURI** result);
|
||||
|
||||
|
|
|
@ -300,7 +300,7 @@ Classes = [
|
|||
{
|
||||
'cid': '{bfc310d2-38a0-11d3-8cd3-0060b0fc14a3}',
|
||||
'contract_ids': ['@mozilla.org/network/protocol;1?name=javascript'],
|
||||
'legacy_constructor': 'nsJSProtocolHandler::Create',
|
||||
'type': 'nsJSProtocolHandler',
|
||||
'headers': ['nsJSProtocolHandler.h'],
|
||||
},
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче