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

Remove 'Protocol' suffix from IPDL-generated files

Browse Source
This commit is contained in:
Ben Turner 2009-09-09 15:59:06 -07:00
parent dccb0805dd
commit c6ad60ed4d
26 changed files with 107 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/ipc/ContentProcessChild.cpp
View File

@ -73,10 +73,10 @@ ContentProcessChild::Init(MessageLoop* aIOLoop, IPC::Channel* aChannel)
return true;
}
PIFrameEmbeddingProtocolChild*
PIFrameEmbeddingChild*
ContentProcessChild::PIFrameEmbeddingConstructor(const MagicWindowHandle& hwnd)
{
PIFrameEmbeddingProtocolChild* iframe = new TabChild(hwnd);
PIFrameEmbeddingChild* iframe = new TabChild(hwnd);
if (iframe && mIFrames.AppendElement(iframe)) {
return iframe;
}
@ -85,16 +85,16 @@ ContentProcessChild::PIFrameEmbeddingConstructor(const MagicWindowHandle& hwnd)
}
nsresult
ContentProcessChild::PIFrameEmbeddingDestructor(PIFrameEmbeddingProtocolChild* iframe)
ContentProcessChild::PIFrameEmbeddingDestructor(PIFrameEmbeddingChild* iframe)
{
mIFrames.RemoveElement(iframe);
return NS_OK;
}
PTestShellProtocolChild*
PTestShellChild*
ContentProcessChild::PTestShellConstructor()
{
PTestShellProtocolChild* testshell = new TestShellChild();
PTestShellChild* testshell = new TestShellChild();
if (testshell && mTestShells.AppendElement(testshell)) {
return testshell;
}
@ -103,7 +103,7 @@ ContentProcessChild::PTestShellConstructor()
}
nsresult
ContentProcessChild::PTestShellDestructor(PTestShellProtocolChild* shell)
ContentProcessChild::PTestShellDestructor(PTestShellChild* shell)
{
mTestShells.RemoveElement(shell);
return NS_OK;

17
dom/ipc/ContentProcessChild.h
View File

@ -39,7 +39,7 @@
#ifndef mozilla_dom_ContentProcessChild_h
#define mozilla_dom_ContentProcessChild_h
#include "mozilla/dom/PContentProcessProtocolChild.h"
#include "mozilla/dom/PContentProcessChild.h"
#include "nsTArray.h"
#include "nsAutoPtr.h"
@ -47,8 +47,7 @@
namespace mozilla {
namespace dom {
class ContentProcessChild
: public PContentProcessProtocolChild
class ContentProcessChild : public PContentProcessChild
{
public:
ContentProcessChild();
@ -61,11 +60,11 @@ public:
return sSingleton;
}
virtual PIFrameEmbeddingProtocolChild* PIFrameEmbeddingConstructor(const MagicWindowHandle& hwnd);
virtual nsresult PIFrameEmbeddingDestructor(PIFrameEmbeddingProtocolChild*);
virtual PIFrameEmbeddingChild* PIFrameEmbeddingConstructor(const MagicWindowHandle& hwnd);
virtual nsresult PIFrameEmbeddingDestructor(PIFrameEmbeddingChild*);
virtual PTestShellProtocolChild* PTestShellConstructor();
virtual nsresult PTestShellDestructor(PTestShellProtocolChild*);
virtual PTestShellChild* PTestShellConstructor();
virtual nsresult PTestShellDestructor(PTestShellChild*);
void Quit();
virtual nsresult RecvQuit();
@ -73,8 +72,8 @@ public:
private:
static ContentProcessChild* sSingleton;
nsTArray<nsAutoPtr<PIFrameEmbeddingProtocolChild> > mIFrames;
nsTArray<nsAutoPtr<PTestShellProtocolChild> > mTestShells;
nsTArray<nsAutoPtr<PIFrameEmbeddingChild> > mIFrames;
nsTArray<nsAutoPtr<PTestShellChild> > mTestShells;
PRBool mQuit;

8
dom/ipc/ContentProcessParent.cpp
View File

@ -140,27 +140,27 @@ ContentProcessParent::OnWaitableEventSignaled(base::WaitableEvent *event)
mon.Notify();
}
PIFrameEmbeddingProtocolParent*
PIFrameEmbeddingParent*
ContentProcessParent::PIFrameEmbeddingConstructor(const MagicWindowHandle& parentWidget)
{
return new TabParent();
}
nsresult
ContentProcessParent::PIFrameEmbeddingDestructor(PIFrameEmbeddingProtocolParent* frame)
ContentProcessParent::PIFrameEmbeddingDestructor(PIFrameEmbeddingParent* frame)
{
delete frame;
return NS_OK;
}
PTestShellProtocolParent*
PTestShellParent*
ContentProcessParent::PTestShellConstructor()
{
return new TestShellParent();
}
nsresult
ContentProcessParent::PTestShellDestructor(PTestShellProtocolParent* shell)
ContentProcessParent::PTestShellDestructor(PTestShellParent* shell)
{
delete shell;
return NS_OK;

21
dom/ipc/ContentProcessParent.h
View File

@ -41,7 +41,7 @@
#include "base/waitable_event_watcher.h"
#include "mozilla/dom/PContentProcessProtocolParent.h"
#include "mozilla/dom/PContentProcessParent.h"
#include "mozilla/ipc/GeckoChildProcessHost.h"
#include "nsIObserver.h"
@ -57,10 +57,9 @@ namespace dom {
class TabParent;
class ContentProcessParent
: private PContentProcessProtocolParent,
public base::WaitableEventWatcher::Delegate,
public nsIObserver
class ContentProcessParent : private PContentProcessParent,
public base::WaitableEventWatcher::Delegate,
public nsIObserver
{
private:
typedef mozilla::ipc::GeckoChildProcessHost GeckoChildProcessHost;
@ -86,17 +85,17 @@ private:
// Hide the raw constructor methods since we don't want client code
// using them.
using PContentProcessProtocolParent::SendPIFrameEmbeddingConstructor;
using PContentProcessProtocolParent::SendPTestShellConstructor;
using PContentProcessParent::SendPIFrameEmbeddingConstructor;
using PContentProcessParent::SendPTestShellConstructor;
ContentProcessParent();
virtual ~ContentProcessParent();
virtual PIFrameEmbeddingProtocolParent* PIFrameEmbeddingConstructor(const MagicWindowHandle& parentWidget);
virtual nsresult PIFrameEmbeddingDestructor(PIFrameEmbeddingProtocolParent* frame);
virtual PIFrameEmbeddingParent* PIFrameEmbeddingConstructor(const MagicWindowHandle& parentWidget);
virtual nsresult PIFrameEmbeddingDestructor(PIFrameEmbeddingParent* frame);
virtual PTestShellProtocolParent* PTestShellConstructor();
virtual nsresult PTestShellDestructor(PTestShellProtocolParent* shell);
virtual PTestShellParent* PTestShellConstructor();
virtual nsresult PTestShellDestructor(PTestShellParent* shell);
mozilla::Monitor mMonitor;

5
dom/ipc/TabChild.h
View File

@ -38,15 +38,14 @@
#ifndef mozilla_tabs_TabChild_h
#define mozilla_tabs_TabChild_h
#include "mozilla/dom/PIFrameEmbeddingProtocolChild.h"
#include "mozilla/dom/PIFrameEmbeddingChild.h"
#include "nsIWebNavigation.h"
#include "nsCOMPtr.h"
namespace mozilla {
namespace dom {
class TabChild
: public PIFrameEmbeddingProtocolChild
class TabChild : public PIFrameEmbeddingChild
{
public:
TabChild(const MagicWindowHandle& parentWidget);

5
dom/ipc/TabParent.h
View File

@ -39,7 +39,7 @@
#ifndef mozilla_tabs_TabParent_h
#define mozilla_tabs_TabParent_h
#include "mozilla/dom/PIFrameEmbeddingProtocolParent.h"
#include "mozilla/dom/PIFrameEmbeddingParent.h"
#include "mozilla/ipc/GeckoChildProcessHost.h"
@ -48,8 +48,7 @@ class nsIURI;
namespace mozilla {
namespace dom {
class TabParent
: public PIFrameEmbeddingProtocolParent
class TabParent : public PIFrameEmbeddingParent
{
public:
TabParent();

4
dom/plugins/BrowserStreamChild.h
View File

@ -38,14 +38,14 @@
#ifndef mozilla_plugins_BrowserStreamChild_h
#define mozilla_plugins_BrowserStreamChild_h 1
#include "mozilla/plugins/PBrowserStreamProtocolChild.h"
#include "mozilla/plugins/PBrowserStreamChild.h"
namespace mozilla {
namespace plugins {
class PluginInstanceChild;
class BrowserStreamChild : public PBrowserStreamProtocolChild
class BrowserStreamChild : public PBrowserStreamChild
{
public:
BrowserStreamChild(PluginInstanceChild* instance,

4
dom/plugins/BrowserStreamParent.h
View File

@ -3,14 +3,14 @@
#ifndef mozilla_plugins_BrowserStreamParent_h
#define mozilla_plugins_BrowserStreamParent_h
#include "mozilla/plugins/PBrowserStreamProtocolParent.h"
#include "mozilla/plugins/PBrowserStreamParent.h"
namespace mozilla {
namespace plugins {
class PluginInstanceParent;
class BrowserStreamParent : public PBrowserStreamProtocolParent
class BrowserStreamParent : public PBrowserStreamParent
{
friend class PluginModuleParent;
friend class PluginInstanceParent;

8
dom/plugins/PluginInstanceChild.cpp
View File

@ -362,7 +362,7 @@ PluginInstanceChild::PluginWindowProc(HWND hWnd,
#endif // OS_WIN
PPluginScriptableObjectProtocolChild*
PPluginScriptableObjectChild*
PluginInstanceChild::PPluginScriptableObjectConstructor(NPError* _retval)
{
NS_NOTYETIMPLEMENTED("PluginInstanceChild::NPObjectConstructor");
@ -370,14 +370,14 @@ PluginInstanceChild::PPluginScriptableObjectConstructor(NPError* _retval)
}
nsresult
PluginInstanceChild::PPluginScriptableObjectDestructor(PPluginScriptableObjectProtocolChild* aObject,
PluginInstanceChild::PPluginScriptableObjectDestructor(PPluginScriptableObjectChild* aObject,
NPError* _retval)
{
NS_NOTYETIMPLEMENTED("PluginInstanceChild::NPObjectDestructor");
return NS_ERROR_NOT_IMPLEMENTED;
}
PBrowserStreamProtocolChild*
PBrowserStreamChild*
PluginInstanceChild::PBrowserStreamConstructor(const nsCString& url,
const uint32_t& length,
const uint32_t& lastmodified,
@ -392,7 +392,7 @@ PluginInstanceChild::PBrowserStreamConstructor(const nsCString& url,
}
nsresult
PluginInstanceChild::PBrowserStreamDestructor(PBrowserStreamProtocolChild* stream,
PluginInstanceChild::PBrowserStreamDestructor(PBrowserStreamChild* stream,
const NPError& reason,
const bool& artificial)
{

15
dom/plugins/PluginInstanceChild.h
View File

@ -39,7 +39,7 @@
#ifndef dom_plugins_PluginInstanceChild_h
#define dom_plugins_PluginInstanceChild_h 1
#include "mozilla/plugins/PPluginInstanceProtocolChild.h"
#include "mozilla/plugins/PPluginInstanceChild.h"
#include "mozilla/plugins/PluginScriptableObjectChild.h"
#include "npfunctions.h"
@ -50,9 +50,10 @@
namespace mozilla {
namespace plugins {
class PBrowserStreamProtocolChild;
class PBrowserStreamChild;
class BrowserStreamChild;
class PluginInstanceChild : public PPluginInstanceProtocolChild
class PluginInstanceChild : public PPluginInstanceChild
{
#ifdef OS_WIN
friend LRESULT CALLBACK PluginWindowProc(HWND hWnd,
@ -68,15 +69,15 @@ protected:
virtual nsresult AnswerNPP_GetValue(const nsString& key, nsString* value);
virtual PPluginScriptableObjectProtocolChild*
virtual PPluginScriptableObjectChild*
PPluginScriptableObjectConstructor(NPError* _retval);
virtual nsresult
PPluginScriptableObjectDestructor(PPluginScriptableObjectProtocolChild* aObject,
PPluginScriptableObjectDestructor(PPluginScriptableObjectChild* aObject,
NPError* _retval);
virtual PBrowserStreamProtocolChild*
virtual PBrowserStreamChild*
PBrowserStreamConstructor(const nsCString& url,
const uint32_t& length,
const uint32_t& lastmodified,
@ -87,7 +88,7 @@ protected:
uint16_t *stype);
virtual nsresult
PBrowserStreamDestructor(PBrowserStreamProtocolChild* stream,
PBrowserStreamDestructor(PBrowserStreamChild* stream,
const NPError& reason,
const bool& artificial);

10
dom/plugins/PluginInstanceParent.cpp
View File

@ -42,7 +42,7 @@
namespace mozilla {
namespace plugins {
PBrowserStreamProtocolParent*
PBrowserStreamParent*
PluginInstanceParent::PBrowserStreamConstructor(const nsCString& url,
const uint32_t& length,
const uint32_t& lastmodified,
@ -57,7 +57,7 @@ PluginInstanceParent::PBrowserStreamConstructor(const nsCString& url,
}
nsresult
PluginInstanceParent::AnswerPBrowserStreamDestructor(PBrowserStreamProtocolParent* stream,
PluginInstanceParent::AnswerPBrowserStreamDestructor(PBrowserStreamParent* stream,
const NPError& reason,
const bool& artificial)
{
@ -68,7 +68,7 @@ PluginInstanceParent::AnswerPBrowserStreamDestructor(PBrowserStreamProtocolParen
}
nsresult
PluginInstanceParent::PBrowserStreamDestructor(PBrowserStreamProtocolParent* stream,
PluginInstanceParent::PBrowserStreamDestructor(PBrowserStreamParent* stream,
const NPError& reason,
const bool& artificial)
{
@ -136,7 +136,7 @@ PluginInstanceParent::NPP_DestroyStream(NPStream* stream, NPReason reason)
return CallPBrowserStreamDestructor(sp, reason, false);
}
PPluginScriptableObjectProtocolParent*
PPluginScriptableObjectParent*
PluginInstanceParent::PPluginScriptableObjectConstructor(NPError* _retval)
{
NS_NOTYETIMPLEMENTED("PluginInstanceParent::PPluginScriptableObjectConstructor");
@ -144,7 +144,7 @@ PluginInstanceParent::PPluginScriptableObjectConstructor(NPError* _retval)
}
nsresult
PluginInstanceParent::PPluginScriptableObjectDestructor(PPluginScriptableObjectProtocolParent* aObject,
PluginInstanceParent::PPluginScriptableObjectDestructor(PPluginScriptableObjectParent* aObject,
NPError* _retval)
{
NS_NOTYETIMPLEMENTED("PluginInstanceParent::PPluginScriptableObjectDestructor");

15
dom/plugins/PluginInstanceParent.h
View File

@ -39,7 +39,7 @@
#ifndef dom_plugins_PluginInstanceParent_h
#define dom_plugins_PluginInstanceParent_h 1
#include "mozilla/plugins/PPluginInstanceProtocolParent.h"
#include "mozilla/plugins/PPluginInstanceParent.h"
#include "mozilla/plugins/PluginScriptableObjectParent.h"
#include "npfunctions.h"
@ -50,9 +50,10 @@
namespace mozilla {
namespace plugins {
class PBrowserStreamParent;
class BrowserStreamParent;
class PluginInstanceParent : public PPluginInstanceProtocolParent
class PluginInstanceParent : public PPluginInstanceParent
{
friend class PluginModuleParent;
friend class BrowserStreamParent;
@ -73,14 +74,14 @@ public:
return NS_OK;
}
virtual PPluginScriptableObjectProtocolParent*
virtual PPluginScriptableObjectParent*
PPluginScriptableObjectConstructor(NPError* _retval);
virtual nsresult
PPluginScriptableObjectDestructor(PPluginScriptableObjectProtocolParent* aObject,
PPluginScriptableObjectDestructor(PPluginScriptableObjectParent* aObject,
NPError* _retval);
virtual PBrowserStreamProtocolParent*
virtual PBrowserStreamParent*
PBrowserStreamConstructor(const nsCString& url,
const uint32_t& length,
const uint32_t& lastmodified,
@ -91,12 +92,12 @@ public:
uint16_t *stype);
virtual nsresult
AnswerPBrowserStreamDestructor(PBrowserStreamProtocolParent* stream,
AnswerPBrowserStreamDestructor(PBrowserStreamParent* stream,
const NPError& reason,
const bool& artificial);
virtual nsresult
PBrowserStreamDestructor(PBrowserStreamProtocolParent* stream,
PBrowserStreamDestructor(PBrowserStreamParent* stream,
const NPError& reason,
const bool& artificial);

4
dom/plugins/PluginModuleChild.cpp
View File

@ -912,7 +912,7 @@ PluginModuleChild::AnswerNP_Initialize(NPError* _retval)
#endif
}
PPluginInstanceProtocolChild*
PPluginInstanceChild*
PluginModuleChild::PPluginInstanceConstructor(const nsCString& aMimeType,
const uint16_t& aMode,
const nsTArray<nsCString>& aNames,
@ -966,7 +966,7 @@ PluginModuleChild::PPluginInstanceConstructor(const nsCString& aMimeType,
}
nsresult
PluginModuleChild::PPluginInstanceDestructor(PPluginInstanceProtocolChild* actor,
PluginModuleChild::PPluginInstanceDestructor(PPluginInstanceChild* actor,
NPError* rv)
{
_MOZ_LOG(__FUNCTION__);

10
dom/plugins/PluginModuleChild.h
View File

@ -53,7 +53,7 @@
#include "nsAutoPtr.h"
#include "mozilla/plugins/PPluginModuleProtocolChild.h"
#include "mozilla/plugins/PPluginModuleChild.h"
#include "mozilla/plugins/PluginInstanceChild.h"
// NOTE: stolen from nsNPAPIPlugin.h
@ -93,13 +93,13 @@ namespace mozilla {
namespace plugins {
//-----------------------------------------------------------------------------
class PluginModuleChild : public PPluginModuleProtocolChild
class PluginModuleChild : public PPluginModuleChild
{
protected:
// Implement the PPluginModuleProtocolChild interface
// Implement the PPluginModuleChild interface
virtual nsresult AnswerNP_Initialize(NPError* rv);
virtual PPluginInstanceProtocolChild*
virtual PPluginInstanceChild*
PPluginInstanceConstructor(const nsCString& aMimeType,
const uint16_t& aMode,
const nsTArray<nsCString>& aNames,
@ -107,7 +107,7 @@ protected:
NPError* rv);
virtual nsresult
PPluginInstanceDestructor(PPluginInstanceProtocolChild* actor,
PPluginInstanceDestructor(PPluginInstanceChild* actor,
NPError* rv);
public:

4
dom/plugins/PluginModuleParent.cpp
View File

@ -75,7 +75,7 @@ PluginModuleParent::~PluginModuleParent()
delete mShim;
}
PPluginInstanceProtocolParent*
PPluginInstanceParent*
PluginModuleParent::PPluginInstanceConstructor(const nsCString& aMimeType,
const uint16_t& aMode,
const nsTArray<nsCString>& aNames,
@ -87,7 +87,7 @@ PluginModuleParent::PPluginInstanceConstructor(const nsCString& aMimeType,
}
nsresult
PluginModuleParent::PPluginInstanceDestructor(PPluginInstanceProtocolParent* aActor,
PluginModuleParent::PPluginInstanceDestructor(PPluginInstanceParent* aActor,
NPError* _retval)
{
_MOZ_LOG(__FUNCTION__);

8
dom/plugins/PluginModuleParent.h
View File

@ -52,7 +52,7 @@
#include "base/string_util.h"
#include "mozilla/SharedLibrary.h"
#include "mozilla/plugins/PPluginModuleProtocolParent.h"
#include "mozilla/plugins/PPluginModuleParent.h"
#include "mozilla/plugins/PluginInstanceParent.h"
#include "mozilla/plugins/PluginProcessParent.h"
@ -76,13 +76,13 @@ namespace plugins {
* child process needs to make these calls back into Gecko proper.
* This class is responsible for "actually" making those function calls.
*/
class PluginModuleParent : public PPluginModuleProtocolParent
class PluginModuleParent : public PPluginModuleParent
{
private:
typedef mozilla::SharedLibrary SharedLibrary;
protected:
PPluginInstanceProtocolParent*
PPluginInstanceParent*
PPluginInstanceConstructor(const nsCString& aMimeType,
const uint16_t& aMode,
const nsTArray<nsCString>& aNames,
@ -90,7 +90,7 @@ protected:
NPError* rv);
virtual nsresult
PPluginInstanceDestructor(PPluginInstanceProtocolParent* aActor,
PPluginInstanceDestructor(PPluginInstanceParent* aActor,
NPError* _retval);
public:

4
dom/plugins/PluginScriptableObjectChild.h
View File

@ -39,12 +39,12 @@
#ifndef dom_plugins_PluginScriptableObjectChild_h
#define dom_plugins_PluginScriptableObjectChild_h 1
#include "mozilla/plugins/PPluginScriptableObjectProtocolChild.h"
#include "mozilla/plugins/PPluginScriptableObjectChild.h"
namespace mozilla {
namespace plugins {
class PluginScriptableObjectChild : public PPluginScriptableObjectProtocolChild
class PluginScriptableObjectChild : public PPluginScriptableObjectChild
{
public:
PluginScriptableObjectChild();

4
dom/plugins/PluginScriptableObjectParent.h
View File

@ -39,12 +39,12 @@
#ifndef dom_plugins_PluginScriptableObjectParent_h
#define dom_plugins_PluginScriptableObjectParent_h 1
#include "mozilla/plugins/PPluginScriptableObjectProtocolParent.h"
#include "mozilla/plugins/PPluginScriptableObjectParent.h"
namespace mozilla {
namespace plugins {
class PluginScriptableObjectParent : public PPluginScriptableObjectProtocolParent
class PluginScriptableObjectParent : public PPluginScriptableObjectParent
{
public:
PluginScriptableObjectParent();

2
ipc/ipdl/ipdl.py
View File

@ -81,7 +81,7 @@ for f in files:
print >>sys.stderr, 'Specification could not be parsed.'
sys.exit(1)
allprotocols.append('%sProtocolMsgStart' % ast.protocol.name)
allprotocols.append('%sMsgStart' % ast.protocol.name)
log(2, 'checking types')
if not ipdl.typecheck(ast):

4
ipc/ipdl/ipdl/lower.py
View File

@ -48,11 +48,11 @@ def _protocolHeaderFilename(p, pname):
return _joinProtocolNamespacesName('/', p, pname)+ '.h'
def _protocolHeaderName(pname):
return pname +'Protocol'
return pname
def _actorName(pname, side):
"""|pname| is the protocol name. |side| is 'Parent' or 'Child'."""
return pname +'Protocol'+ side
return pname + side
def _makeForwardDecl(p, side):
clsname = _actorName(p.decl.type.qname.baseid, side)

5
ipc/test-harness/TestChild.h
View File

@ -38,14 +38,13 @@
#ifndef ipc_test_harness_TestChild_h
#define ipc_test_harness_TestChild_h 1
#include "mozilla/test/PTestProtocolChild.h"
#include "mozilla/test/PTestChild.h"
namespace mozilla {
namespace test {
// Header file contents
class TestChild :
public PTestProtocolChild
class TestChild : public PTestChild
{
protected:

5
ipc/test-harness/TestParent.h
View File

@ -38,14 +38,13 @@
#ifndef ipc_test_harness_TestParent_h
#define ipc_test_harness_TestParent_h 1
#include "mozilla/test/PTestProtocolParent.h"
#include "mozilla/test/PTestParent.h"
namespace mozilla {
namespace test {
// Header file contents
class TestParent :
public PTestProtocolParent
class TestParent : public PTestParent
{
protected:
#if 1

10
ipc/testshell/TestShellChild.cpp
View File

@ -37,7 +37,7 @@
#include "TestShellChild.h"
using mozilla::ipc::TestShellChild;
using mozilla::ipc::PTestShellCommandProtocolChild;
using mozilla::ipc::PTestShellCommandChild;
using mozilla::ipc::XPCShellEnvironment;
TestShellChild::TestShellChild()
@ -56,14 +56,14 @@ TestShellChild::RecvExecuteCommand(const nsString& aCommand)
return mXPCShell->EvaluateString(aCommand) ? NS_OK : NS_ERROR_FAILURE;
}
PTestShellCommandProtocolChild*
PTestShellCommandChild*
TestShellChild::PTestShellCommandConstructor(const nsString& aCommand)
{
return new PTestShellCommandProtocolChild();
return new PTestShellCommandChild();
}
nsresult
TestShellChild::PTestShellCommandDestructor(PTestShellCommandProtocolChild* aCommand,
TestShellChild::PTestShellCommandDestructor(PTestShellCommandChild* aCommand,
const nsString& aResponse)
{
NS_ENSURE_ARG_POINTER(aCommand);
@ -72,7 +72,7 @@ TestShellChild::PTestShellCommandDestructor(PTestShellCommandProtocolChild* aCom
}
nsresult
TestShellChild::RecvPTestShellCommandConstructor(PTestShellCommandProtocolChild* aActor,
TestShellChild::RecvPTestShellCommandConstructor(PTestShellCommandChild* aActor,
const nsString& aCommand)
{
NS_ASSERTION(aActor, "Shouldn't be null!");

12
ipc/testshell/TestShellChild.h
View File

@ -37,8 +37,8 @@
#ifndef ipc_testshell_TestShellChild_h
#define ipc_testshell_TestShellChild_h 1
#include "mozilla/ipc/PTestShellProtocolChild.h"
#include "mozilla/ipc/PTestShellCommandProtocolChild.h"
#include "mozilla/ipc/PTestShellChild.h"
#include "mozilla/ipc/PTestShellCommandChild.h"
#include "mozilla/ipc/XPCShellEnvironment.h"
#include "nsAutoPtr.h"
@ -48,7 +48,7 @@ namespace ipc {
class XPCShellEnvironment;
class TestShellChild : public PTestShellProtocolChild
class TestShellChild : public PTestShellChild
{
public:
TestShellChild();
@ -56,15 +56,15 @@ public:
nsresult
RecvExecuteCommand(const nsString& aCommand);
PTestShellCommandProtocolChild*
PTestShellCommandChild*
PTestShellCommandConstructor(const nsString& aCommand);
nsresult
RecvPTestShellCommandConstructor(PTestShellCommandProtocolChild* aActor,
RecvPTestShellCommandConstructor(PTestShellCommandChild* aActor,
const nsString& aCommand);
nsresult
PTestShellCommandDestructor(PTestShellCommandProtocolChild* aCommand,
PTestShellCommandDestructor(PTestShellCommandChild* aCommand,
const nsString& aResponse);
void SetXPCShell(XPCShellEnvironment* aXPCShell) {

8
ipc/testshell/TestShellParent.cpp
View File

@ -40,16 +40,16 @@
using mozilla::ipc::TestShellParent;
using mozilla::ipc::TestShellCommandParent;
using mozilla::ipc::PTestShellCommandProtocolParent;
using mozilla::ipc::PTestShellCommandParent;
PTestShellCommandProtocolParent*
PTestShellCommandParent*
TestShellParent::PTestShellCommandConstructor(const nsString& aCommand)
{
return new TestShellCommandParent();
}
nsresult
TestShellParent::PTestShellCommandDestructor(PTestShellCommandProtocolParent* aActor,
TestShellParent::PTestShellCommandDestructor(PTestShellCommandParent* aActor,
const nsString& aResponse)
{
NS_ENSURE_ARG_POINTER(aActor);
@ -58,7 +58,7 @@ TestShellParent::PTestShellCommandDestructor(PTestShellCommandProtocolParent* aA
}
nsresult
TestShellParent::RecvPTestShellCommandDestructor(PTestShellCommandProtocolParent* aActor,
TestShellParent::RecvPTestShellCommandDestructor(PTestShellCommandParent* aActor,
const nsString& aResponse)
{
NS_ENSURE_ARG_POINTER(aActor);

14
ipc/testshell/TestShellParent.h
View File

@ -37,8 +37,8 @@
#ifndef ipc_testshell_TestShellParent_h
#define ipc_testshell_TestShellParent_h 1
#include "mozilla/ipc/PTestShellProtocolParent.h"
#include "mozilla/ipc/PTestShellCommandProtocolParent.h"
#include "mozilla/ipc/PTestShellParent.h"
#include "mozilla/ipc/PTestShellCommandParent.h"
#include "jsapi.h"
#include "nsAutoJSValHolder.h"
@ -47,7 +47,7 @@
namespace mozilla {
namespace ipc {
class TestShellCommandParent : public PTestShellCommandProtocolParent
class TestShellCommandParent : public PTestShellCommandParent
{
public:
TestShellCommandParent() : mCx(NULL) { }
@ -64,18 +64,18 @@ private:
nsAutoJSValHolder mCallback;
};
class TestShellParent : public PTestShellProtocolParent
class TestShellParent : public PTestShellParent
{
public:
PTestShellCommandProtocolParent*
PTestShellCommandParent*
PTestShellCommandConstructor(const nsString& aCommand);
nsresult
PTestShellCommandDestructor(PTestShellCommandProtocolParent* aActor,
PTestShellCommandDestructor(PTestShellCommandParent* aActor,
const nsString& aResponse);
nsresult
RecvPTestShellCommandDestructor(PTestShellCommandProtocolParent* aActor,
RecvPTestShellCommandDestructor(PTestShellCommandParent* aActor,
const nsString& aResponse);
};