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 885804: Renaming in netwerk r=jduell

Browse Source
This commit is contained in:
David Zbarsky 2013-07-08 11:48:39 -04:00
parent 33b35a2eb2
commit ef2f22909f
7 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
netwerk/ipc/NeckoChild.cpp
View File

@ -61,20 +61,20 @@ void NeckoChild::DestroyNeckoChild()
}
PHttpChannelChild*
NeckoChild::AllocPHttpChannel(PBrowserChild* browser,
const SerializedLoadContext& loadContext,
const HttpChannelCreationArgs& aOpenArgs)
NeckoChild::AllocPHttpChannelChild(PBrowserChild* browser,
const SerializedLoadContext& loadContext,
const HttpChannelCreationArgs& aOpenArgs)
{
// We don't allocate here: instead we always use IPDL constructor that takes
// an existing HttpChildChannel
NS_NOTREACHED("AllocPHttpChannel should not be called on child");
NS_NOTREACHED("AllocPHttpChannelChild should not be called on child");
return nullptr;
}
bool
NeckoChild::DeallocPHttpChannel(PHttpChannelChild* channel)
NeckoChild::DeallocPHttpChannelChild(PHttpChannelChild* channel)
{
NS_ABORT_IF_FALSE(IsNeckoChild(), "DeallocPHttpChannel called by non-child!");
NS_ABORT_IF_FALSE(IsNeckoChild(), "DeallocPHttpChannelChild called by non-child!");
HttpChannelChild* child = static_cast<HttpChannelChild*>(channel);
child->ReleaseIPDLReference();
@ -82,37 +82,37 @@ NeckoChild::DeallocPHttpChannel(PHttpChannelChild* channel)
}
PFTPChannelChild*
NeckoChild::AllocPFTPChannel(PBrowserChild* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs)
NeckoChild::AllocPFTPChannelChild(PBrowserChild* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs)
{
// We don't allocate here: see FTPChannelChild::AsyncOpen()
NS_RUNTIMEABORT("AllocPFTPChannel should not be called");
NS_RUNTIMEABORT("AllocPFTPChannelChild should not be called");
return nullptr;
}
bool
NeckoChild::DeallocPFTPChannel(PFTPChannelChild* channel)
NeckoChild::DeallocPFTPChannelChild(PFTPChannelChild* channel)
{
NS_ABORT_IF_FALSE(IsNeckoChild(), "DeallocPFTPChannel called by non-child!");
NS_ABORT_IF_FALSE(IsNeckoChild(), "DeallocPFTPChannelChild called by non-child!");
FTPChannelChild* child = static_cast<FTPChannelChild*>(channel);
child->ReleaseIPDLReference();
return true;
}
PCookieServiceChild*
NeckoChild::AllocPCookieService()
PCookieServiceChild*
NeckoChild::AllocPCookieServiceChild()
{
// We don't allocate here: see nsCookieService::GetSingleton()
NS_NOTREACHED("AllocPCookieService should not be called");
NS_NOTREACHED("AllocPCookieServiceChild should not be called");
return nullptr;
}
bool
NeckoChild::DeallocPCookieService(PCookieServiceChild* cs)
bool
NeckoChild::DeallocPCookieServiceChild(PCookieServiceChild* cs)
{
NS_ASSERTION(IsNeckoChild(), "DeallocPCookieService called by non-child!");
NS_ASSERTION(IsNeckoChild(), "DeallocPCookieServiceChild called by non-child!");
CookieServiceChild *p = static_cast<CookieServiceChild*>(cs);
p->Release();
@ -120,7 +120,7 @@ NeckoChild::DeallocPCookieService(PCookieServiceChild* cs)
}
PWyciwygChannelChild*
NeckoChild::AllocPWyciwygChannel()
NeckoChild::AllocPWyciwygChannelChild()
{
WyciwygChannelChild *p = new WyciwygChannelChild();
p->AddIPDLReference();
@ -128,9 +128,9 @@ NeckoChild::AllocPWyciwygChannel()
}
bool
NeckoChild::DeallocPWyciwygChannel(PWyciwygChannelChild* channel)
NeckoChild::DeallocPWyciwygChannelChild(PWyciwygChannelChild* channel)
{
NS_ABORT_IF_FALSE(IsNeckoChild(), "DeallocPWyciwygChannel called by non-child!");
NS_ABORT_IF_FALSE(IsNeckoChild(), "DeallocPWyciwygChannelChild called by non-child!");
WyciwygChannelChild *p = static_cast<WyciwygChannelChild*>(channel);
p->ReleaseIPDLReference();
@ -138,15 +138,15 @@ NeckoChild::DeallocPWyciwygChannel(PWyciwygChannelChild* channel)
}
PWebSocketChild*
NeckoChild::AllocPWebSocket(PBrowserChild* browser,
const SerializedLoadContext& aSerialized)
NeckoChild::AllocPWebSocketChild(PBrowserChild* browser,
const SerializedLoadContext& aSerialized)
{
NS_NOTREACHED("AllocPWebSocket should not be called");
NS_NOTREACHED("AllocPWebSocketChild should not be called");
return nullptr;
}
bool
NeckoChild::DeallocPWebSocket(PWebSocketChild* child)
NeckoChild::DeallocPWebSocketChild(PWebSocketChild* child)
{
WebSocketChannelChild* p = static_cast<WebSocketChannelChild*>(child);
p->ReleaseIPDLReference();
@ -154,18 +154,18 @@ NeckoChild::DeallocPWebSocket(PWebSocketChild* child)
}
PTCPSocketChild*
NeckoChild::AllocPTCPSocket(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserChild* aBrowser)
NeckoChild::AllocPTCPSocketChild(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserChild* aBrowser)
{
NS_NOTREACHED("AllocPTCPSocket should not be called");
NS_NOTREACHED("AllocPTCPSocketChild should not be called");
return nullptr;
}
bool
NeckoChild::DeallocPTCPSocket(PTCPSocketChild* child)
NeckoChild::DeallocPTCPSocketChild(PTCPSocketChild* child)
{
TCPSocketChild* p = static_cast<TCPSocketChild*>(child);
p->ReleaseIPDLReference();
@ -173,16 +173,16 @@ NeckoChild::DeallocPTCPSocket(PTCPSocketChild* child)
}
PRemoteOpenFileChild*
NeckoChild::AllocPRemoteOpenFile(const URIParams&, PBrowserChild*)
NeckoChild::AllocPRemoteOpenFileChild(const URIParams&, PBrowserChild*)
{
// We don't allocate here: instead we always use IPDL constructor that takes
// an existing RemoteOpenFileChild
NS_NOTREACHED("AllocPRemoteOpenFile should not be called on child");
NS_NOTREACHED("AllocPRemoteOpenFileChild should not be called on child");
return nullptr;
}
bool
NeckoChild::DeallocPRemoteOpenFile(PRemoteOpenFileChild* aChild)
NeckoChild::DeallocPRemoteOpenFileChild(PRemoteOpenFileChild* aChild)
{
RemoteOpenFileChild *p = static_cast<RemoteOpenFileChild*>(aChild);
p->ReleaseIPDLReference();

44
netwerk/ipc/NeckoChild.h
View File

@ -27,29 +27,29 @@ public:
protected:
virtual PHttpChannelChild*
AllocPHttpChannel(PBrowserChild*, const SerializedLoadContext&,
const HttpChannelCreationArgs& aOpenArgs);
virtual bool DeallocPHttpChannel(PHttpChannelChild*);
virtual PCookieServiceChild* AllocPCookieService();
virtual bool DeallocPCookieService(PCookieServiceChild*);
virtual PWyciwygChannelChild* AllocPWyciwygChannel();
virtual bool DeallocPWyciwygChannel(PWyciwygChannelChild*);
AllocPHttpChannelChild(PBrowserChild*, const SerializedLoadContext&,
const HttpChannelCreationArgs& aOpenArgs);
virtual bool DeallocPHttpChannelChild(PHttpChannelChild*);
virtual PCookieServiceChild* AllocPCookieServiceChild();
virtual bool DeallocPCookieServiceChild(PCookieServiceChild*);
virtual PWyciwygChannelChild* AllocPWyciwygChannelChild();
virtual bool DeallocPWyciwygChannelChild(PWyciwygChannelChild*);
virtual PFTPChannelChild*
AllocPFTPChannel(PBrowserChild* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs);
virtual bool DeallocPFTPChannel(PFTPChannelChild*);
virtual PWebSocketChild* AllocPWebSocket(PBrowserChild*, const SerializedLoadContext&);
virtual bool DeallocPWebSocket(PWebSocketChild*);
virtual PTCPSocketChild* AllocPTCPSocket(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserChild* aBrowser);
virtual bool DeallocPTCPSocket(PTCPSocketChild*);
virtual PRemoteOpenFileChild* AllocPRemoteOpenFile(const URIParams&,
PBrowserChild*);
virtual bool DeallocPRemoteOpenFile(PRemoteOpenFileChild*);
AllocPFTPChannelChild(PBrowserChild* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs);
virtual bool DeallocPFTPChannelChild(PFTPChannelChild*);
virtual PWebSocketChild* AllocPWebSocketChild(PBrowserChild*, const SerializedLoadContext&);
virtual bool DeallocPWebSocketChild(PWebSocketChild*);
virtual PTCPSocketChild* AllocPTCPSocketChild(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserChild* aBrowser);
virtual bool DeallocPTCPSocketChild(PTCPSocketChild*);
virtual PRemoteOpenFileChild* AllocPRemoteOpenFileChild(const URIParams&,
PBrowserChild*);
virtual bool DeallocPRemoteOpenFileChild(PRemoteOpenFileChild*);
};
/**

56
netwerk/ipc/NeckoParent.cpp
View File

@ -158,15 +158,15 @@ NeckoParent::CreateChannelLoadContext(PBrowserParent* aBrowser,
}
PHttpChannelParent*
NeckoParent::AllocPHttpChannel(PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const HttpChannelCreationArgs& aOpenArgs)
NeckoParent::AllocPHttpChannelParent(PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const HttpChannelCreationArgs& aOpenArgs)
{
nsCOMPtr<nsILoadContext> loadContext;
const char *error = CreateChannelLoadContext(aBrowser, aSerialized,
loadContext);
if (error) {
printf_stderr("NeckoParent::AllocPHttpChannel: "
printf_stderr("NeckoParent::AllocPHttpChannelParent: "
"FATAL error: %s: KILLING CHILD PROCESS\n",
error);
return nullptr;
@ -178,7 +178,7 @@ NeckoParent::AllocPHttpChannel(PBrowserParent* aBrowser,
}
bool
NeckoParent::DeallocPHttpChannel(PHttpChannelParent* channel)
NeckoParent::DeallocPHttpChannelParent(PHttpChannelParent* channel)
{
HttpChannelParent *p = static_cast<HttpChannelParent *>(channel);
p->Release();
@ -197,15 +197,15 @@ NeckoParent::RecvPHttpChannelConstructor(
}
PFTPChannelParent*
NeckoParent::AllocPFTPChannel(PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs)
NeckoParent::AllocPFTPChannelParent(PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs)
{
nsCOMPtr<nsILoadContext> loadContext;
const char *error = CreateChannelLoadContext(aBrowser, aSerialized,
loadContext);
if (error) {
printf_stderr("NeckoParent::AllocPFTPChannel: "
printf_stderr("NeckoParent::AllocPFTPChannelParent: "
"FATAL error: %s: KILLING CHILD PROCESS\n",
error);
return nullptr;
@ -217,7 +217,7 @@ NeckoParent::AllocPFTPChannel(PBrowserParent* aBrowser,
}
bool
NeckoParent::DeallocPFTPChannel(PFTPChannelParent* channel)
NeckoParent::DeallocPFTPChannelParent(PFTPChannelParent* channel)
{
FTPChannelParent *p = static_cast<FTPChannelParent *>(channel);
p->Release();
@ -235,21 +235,21 @@ NeckoParent::RecvPFTPChannelConstructor(
return p->Init(aOpenArgs);
}
PCookieServiceParent*
NeckoParent::AllocPCookieService()
PCookieServiceParent*
NeckoParent::AllocPCookieServiceParent()
{
return new CookieServiceParent();
}
bool
NeckoParent::DeallocPCookieService(PCookieServiceParent* cs)
NeckoParent::DeallocPCookieServiceParent(PCookieServiceParent* cs)
{
delete cs;
return true;
}
PWyciwygChannelParent*
NeckoParent::AllocPWyciwygChannel()
NeckoParent::AllocPWyciwygChannelParent()
{
WyciwygChannelParent *p = new WyciwygChannelParent();
p->AddRef();
@ -257,7 +257,7 @@ NeckoParent::AllocPWyciwygChannel()
}
bool
NeckoParent::DeallocPWyciwygChannel(PWyciwygChannelParent* channel)
NeckoParent::DeallocPWyciwygChannelParent(PWyciwygChannelParent* channel)
{
WyciwygChannelParent *p = static_cast<WyciwygChannelParent *>(channel);
p->Release();
@ -265,14 +265,14 @@ NeckoParent::DeallocPWyciwygChannel(PWyciwygChannelParent* channel)
}
PWebSocketParent*
NeckoParent::AllocPWebSocket(PBrowserParent* browser,
const SerializedLoadContext& serialized)
NeckoParent::AllocPWebSocketParent(PBrowserParent* browser,
const SerializedLoadContext& serialized)
{
nsCOMPtr<nsILoadContext> loadContext;
const char *error = CreateChannelLoadContext(browser, serialized,
loadContext);
if (error) {
printf_stderr("NeckoParent::AllocPWebSocket: "
printf_stderr("NeckoParent::AllocPWebSocketParent: "
"FATAL error: %s: KILLING CHILD PROCESS\n",
error);
return nullptr;
@ -287,7 +287,7 @@ NeckoParent::AllocPWebSocket(PBrowserParent* browser,
}
bool
NeckoParent::DeallocPWebSocket(PWebSocketParent* actor)
NeckoParent::DeallocPWebSocketParent(PWebSocketParent* actor)
{
WebSocketChannelParent* p = static_cast<WebSocketChannelParent*>(actor);
p->Release();
@ -295,11 +295,11 @@ NeckoParent::DeallocPWebSocket(PWebSocketParent* actor)
}
PTCPSocketParent*
NeckoParent::AllocPTCPSocket(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserParent* aBrowser)
NeckoParent::AllocPTCPSocketParent(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserParent* aBrowser)
{
if (UsingNeckoIPCSecurity() && !aBrowser) {
printf_stderr("NeckoParent::AllocPTCPSocket: FATAL error: no browser present \
@ -329,7 +329,7 @@ NeckoParent::RecvPTCPSocketConstructor(PTCPSocketParent* aActor,
}
bool
NeckoParent::DeallocPTCPSocket(PTCPSocketParent* actor)
NeckoParent::DeallocPTCPSocketParent(PTCPSocketParent* actor)
{
TCPSocketParent* p = static_cast<TCPSocketParent*>(actor);
p->Release();
@ -337,8 +337,8 @@ NeckoParent::DeallocPTCPSocket(PTCPSocketParent* actor)
}
PRemoteOpenFileParent*
NeckoParent::AllocPRemoteOpenFile(const URIParams& aURI,
PBrowserParent* aBrowser)
NeckoParent::AllocPRemoteOpenFileParent(const URIParams& aURI,
PBrowserParent* aBrowser)
{
nsCOMPtr<nsIURI> uri = DeserializeURI(aURI);
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(uri);
@ -450,7 +450,7 @@ NeckoParent::RecvPRemoteOpenFileConstructor(PRemoteOpenFileParent* aActor,
}
bool
NeckoParent::DeallocPRemoteOpenFile(PRemoteOpenFileParent* actor)
NeckoParent::DeallocPRemoteOpenFileParent(PRemoteOpenFileParent* actor)
{
delete actor;
return true;

50
netwerk/ipc/NeckoParent.h
View File

@ -52,48 +52,48 @@ public:
protected:
virtual PHttpChannelParent*
AllocPHttpChannel(PBrowserParent*, const SerializedLoadContext&,
const HttpChannelCreationArgs& aOpenArgs);
AllocPHttpChannelParent(PBrowserParent*, const SerializedLoadContext&,
const HttpChannelCreationArgs& aOpenArgs);
virtual bool
RecvPHttpChannelConstructor(
PHttpChannelParent* aActor,
PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const HttpChannelCreationArgs& aOpenArgs);
virtual bool DeallocPHttpChannel(PHttpChannelParent*);
virtual PCookieServiceParent* AllocPCookieService();
virtual bool DeallocPCookieService(PCookieServiceParent*);
virtual PWyciwygChannelParent* AllocPWyciwygChannel();
virtual bool DeallocPWyciwygChannel(PWyciwygChannelParent*);
virtual bool DeallocPHttpChannelParent(PHttpChannelParent*);
virtual PCookieServiceParent* AllocPCookieServiceParent();
virtual bool DeallocPCookieServiceParent(PCookieServiceParent*);
virtual PWyciwygChannelParent* AllocPWyciwygChannelParent();
virtual bool DeallocPWyciwygChannelParent(PWyciwygChannelParent*);
virtual PFTPChannelParent*
AllocPFTPChannel(PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs);
AllocPFTPChannelParent(PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs);
virtual bool
RecvPFTPChannelConstructor(
PFTPChannelParent* aActor,
PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs);
virtual bool DeallocPFTPChannel(PFTPChannelParent*);
virtual PWebSocketParent* AllocPWebSocket(PBrowserParent* browser,
const SerializedLoadContext& aSerialized);
virtual bool DeallocPWebSocket(PWebSocketParent*);
virtual PTCPSocketParent* AllocPTCPSocket(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserParent* aBrowser);
virtual bool DeallocPFTPChannelParent(PFTPChannelParent*);
virtual PWebSocketParent* AllocPWebSocketParent(PBrowserParent* browser,
const SerializedLoadContext& aSerialized);
virtual bool DeallocPWebSocketParent(PWebSocketParent*);
virtual PTCPSocketParent* AllocPTCPSocketParent(const nsString& aHost,
const uint16_t& aPort,
const bool& useSSL,
const nsString& aBinaryType,
PBrowserParent* aBrowser);
virtual PRemoteOpenFileParent* AllocPRemoteOpenFile(const URIParams& aFileURI,
PBrowserParent* aBrowser)
MOZ_OVERRIDE;
virtual PRemoteOpenFileParent* AllocPRemoteOpenFileParent(const URIParams& aFileURI,
PBrowserParent* aBrowser)
MOZ_OVERRIDE;
virtual bool RecvPRemoteOpenFileConstructor(PRemoteOpenFileParent* aActor,
const URIParams& aFileURI,
PBrowserParent* aBrowser)
MOZ_OVERRIDE;
virtual bool DeallocPRemoteOpenFile(PRemoteOpenFileParent* aActor)
MOZ_OVERRIDE;
virtual bool DeallocPRemoteOpenFileParent(PRemoteOpenFileParent* aActor)
MOZ_OVERRIDE;
virtual bool RecvPTCPSocketConstructor(PTCPSocketParent*,
const nsString& aHost,
@ -101,7 +101,7 @@ protected:
const bool& useSSL,
const nsString& aBinaryType,
PBrowserParent* aBrowser);
virtual bool DeallocPTCPSocket(PTCPSocketParent*);
virtual bool DeallocPTCPSocketParent(PTCPSocketParent*);
virtual bool RecvHTMLDNSPrefetch(const nsString& hostname,
const uint16_t& flags);
virtual bool RecvCancelHTMLDNSPrefetch(const nsString& hostname,

2
netwerk/protocol/ftp/FTPChannelChild.cpp
View File

@ -383,7 +383,7 @@ FTPChannelChild::DoOnStopRequest(const nsresult& statusCode)
mLoadGroup->RemoveRequest(this, nullptr, statusCode);
}
// This calls NeckoChild::DeallocPFTPChannel(), which deletes |this| if IPDL
// This calls NeckoChild::DeallocPFTPChannelChild(), which deletes |this| if IPDL
// holds the last reference. Don't rely on |this| existing after here!
Send__delete__(this);
}

2
netwerk/protocol/http/HttpChannelChild.cpp
View File

@ -469,7 +469,7 @@ HttpChannelChild::OnStopRequest(const nsresult& statusCode)
mKeptAlive = true;
SendDocumentChannelCleanup();
} else {
// This calls NeckoChild::DeallocPHttpChannel(), which deletes |this| if IPDL
// This calls NeckoChild::DeallocPHttpChannelChild(), which deletes |this| if IPDL
// holds the last reference. Don't rely on |this| existing after here.
PHttpChannelChild::Send__delete__(this);
}

2
netwerk/protocol/http/HttpChannelChild.h
View File

@ -84,7 +84,7 @@ public:
// IPDL holds a reference while the PHttpChannel protocol is live (starting at
// AsyncOpen, and ending at either OnStopRequest or any IPDL error, either of
// which call NeckoChild::DeallocPHttpChannel()).
// which call NeckoChild::DeallocPHttpChannelChild()).
void AddIPDLReference();
void ReleaseIPDLReference();