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 1177013 - Fix IPDL tests for not allowing CPOWs during sync (r=dvander)

Browse Source
This commit is contained in:
Bill McCloskey 2015-06-25 11:00:50 -07:00
parent b162c4e892
commit 516a454fd6
5 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/ipdl/test/cxx/PTestHighestPrio.ipdl
View File

@ -5,7 +5,7 @@ prio(normal upto urgent) sync protocol PTestHighestPrio
{
parent:
prio(urgent) async Msg1();
sync Msg2();
prio(high) sync Msg2();
prio(urgent) async Msg3();
prio(urgent) sync Msg4();

3
ipc/ipdl/test/cxx/PTestRPC.ipdl
View File

@ -8,8 +8,6 @@ parent:
prio(high) sync Test1_InnerEvent() returns (uint32_t result);
async Test2_Start();
prio(high) sync Test2_OutOfOrder();
sync Test3_Start() returns (uint32_t result);
prio(high) sync Test3_InnerEvent() returns (uint32_t result);
child:
async Start();
@ -17,7 +15,6 @@ child:
prio(high) sync Test1_NoReenter() returns (uint32_t result);
prio(high) sync Test2_FirstUrgent();
prio(high) sync Test2_SecondUrgent();
prio(high) sync Test3_WakeUp() returns (uint32_t result);
};
} // namespace _ipdltest

2
ipc/ipdl/test/cxx/PTestUrgency.ipdl
View File

@ -4,7 +4,7 @@ namespace _ipdltest {
prio(normal upto high) sync protocol PTestUrgency
{
parent:
sync Test1() returns (uint32_t result);
prio(high) sync Test1() returns (uint32_t result);
async Test2();
sync Test3() returns (uint32_t result);
sync FinalTest_Begin();

31
ipc/ipdl/test/cxx/TestRPC.cpp
View File

@ -83,22 +83,6 @@ TestRPCParent::RecvTest2_OutOfOrder()
return true;
}
bool
TestRPCParent::RecvTest3_Start(uint32_t* aResult)
{
if (!SendTest3_WakeUp(aResult))
fail("SendTest3_WakeUp");
return true;
}
bool
TestRPCParent::RecvTest3_InnerEvent(uint32_t* aResult)
{
*aResult = 200;
return true;
}
//-----------------------------------------------------------------------------
// child
@ -128,12 +112,6 @@ TestRPCChild::RecvStart()
if (!SendTest2_OutOfOrder())
fail("SendTest2_OutOfOrder");
result = 0;
if (!SendTest3_Start(&result))
fail("SendTest3_Start");
if (result != 200)
fail("Wrong result (expected 200)");
Close();
return true;
}
@ -170,14 +148,5 @@ TestRPCChild::RecvTest2_SecondUrgent()
return true;
}
bool
TestRPCChild::RecvTest3_WakeUp(uint32_t* aResult)
{
if (!SendTest3_InnerEvent(aResult))
fail("SendTest3_InnerEvent");
return true;
}
} // namespace _ipdltest
} // namespace mozilla

3
ipc/ipdl/test/cxx/TestRPC.h
View File

@ -26,8 +26,6 @@ public:
bool RecvTest1_InnerEvent(uint32_t* aResult) override;
bool RecvTest2_Start() override;
bool RecvTest2_OutOfOrder() override;
bool RecvTest3_Start(uint32_t* aResult) override;
bool RecvTest3_InnerEvent(uint32_t* aResult) override;
virtual void ActorDestroy(ActorDestroyReason why) override
{
@ -59,7 +57,6 @@ public:
bool RecvTest1_NoReenter(uint32_t* aResult) override;
bool RecvTest2_FirstUrgent() override;
bool RecvTest2_SecondUrgent() override;
bool RecvTest3_WakeUp(uint32_t* aResult) override;
virtual void ActorDestroy(ActorDestroyReason why) override
{