Changeset 261270 in webkit


Ignore:
Timestamp:
May 6, 2020, 11:36:12 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Fix webkitpy tests after r261254
​https://bugs.webkit.org/show_bug.cgi?id=211112

test.messages.in was accidentally deleted instead of moved, and messages_unittest.py needed to be told of the new locations of results.
The rest is just running the generator to update results.

  • Scripts/MessageNames.cpp:

(IPC::description):
(IPC::receiverName):
(IPC::isValidMessageName):

  • Scripts/MessageNames.h:
  • Scripts/testMessageReceiver.cpp:

(Messages::WebPage::GetPluginProcessConnection::send):
(Messages::WebPage::TestMultipleAttributes::send):
(WebKit::WebPage::didReceiveMessage):
(WebKit::WebPage::didReceiveSyncMessage):

  • Scripts/testMessages.h:

(Messages::WebPage::messageReceiverName):
(Messages::WebPage::LoadURL::name):
(Messages::WebPage::LoadURL::LoadURL):
(Messages::WebPage::LoadURL::arguments const):
(Messages::WebPage::LoadSomething::name):
(Messages::WebPage::LoadSomething::LoadSomething):
(Messages::WebPage::LoadSomething::arguments const):
(Messages::WebPage::TouchEvent::name):
(Messages::WebPage::TouchEvent::TouchEvent):
(Messages::WebPage::TouchEvent::arguments const):
(Messages::WebPage::AddEvent::name):
(Messages::WebPage::AddEvent::AddEvent):
(Messages::WebPage::AddEvent::arguments const):
(Messages::WebPage::LoadSomethingElse::name):
(Messages::WebPage::LoadSomethingElse::LoadSomethingElse):
(Messages::WebPage::LoadSomethingElse::arguments const):
(Messages::WebPage::DidReceivePolicyDecision::name):
(Messages::WebPage::DidReceivePolicyDecision::DidReceivePolicyDecision):
(Messages::WebPage::DidReceivePolicyDecision::arguments const):
(Messages::WebPage::Close::name):
(Messages::WebPage::Close::arguments const):
(Messages::WebPage::PreferencesDidChange::name):
(Messages::WebPage::PreferencesDidChange::PreferencesDidChange):
(Messages::WebPage::PreferencesDidChange::arguments const):
(Messages::WebPage::SendDoubleAndFloat::name):
(Messages::WebPage::SendDoubleAndFloat::SendDoubleAndFloat):
(Messages::WebPage::SendDoubleAndFloat::arguments const):
(Messages::WebPage::SendInts::name):
(Messages::WebPage::SendInts::SendInts):
(Messages::WebPage::SendInts::arguments const):
(Messages::WebPage::CreatePlugin::name):
(Messages::WebPage::CreatePlugin::CreatePlugin):
(Messages::WebPage::CreatePlugin::arguments const):
(Messages::WebPage::RunJavaScriptAlert::name):
(Messages::WebPage::RunJavaScriptAlert::RunJavaScriptAlert):
(Messages::WebPage::RunJavaScriptAlert::arguments const):
(Messages::WebPage::GetPlugins::name):
(Messages::WebPage::GetPlugins::GetPlugins):
(Messages::WebPage::GetPlugins::arguments const):
(Messages::WebPage::GetPluginProcessConnection::name):
(Messages::WebPage::GetPluginProcessConnection::GetPluginProcessConnection):
(Messages::WebPage::GetPluginProcessConnection::arguments const):
(Messages::WebPage::TestMultipleAttributes::name):
(Messages::WebPage::TestMultipleAttributes::arguments const):
(Messages::WebPage::TestParameterAttributes::name):
(Messages::WebPage::TestParameterAttributes::TestParameterAttributes):
(Messages::WebPage::TestParameterAttributes::arguments const):
(Messages::WebPage::TemplateTest::name):
(Messages::WebPage::TemplateTest::TemplateTest):
(Messages::WebPage::TemplateTest::arguments const):
(Messages::WebPage::SetVideoLayerID::name):
(Messages::WebPage::SetVideoLayerID::SetVideoLayerID):
(Messages::WebPage::SetVideoLayerID::arguments const):
(Messages::WebPage::DidCreateWebProcessConnection::name):
(Messages::WebPage::DidCreateWebProcessConnection::DidCreateWebProcessConnection):
(Messages::WebPage::DidCreateWebProcessConnection::arguments const):
(Messages::WebPage::InterpretKeyEvent::name):
(Messages::WebPage::InterpretKeyEvent::InterpretKeyEvent):
(Messages::WebPage::InterpretKeyEvent::arguments const):
(Messages::WebPage::DeprecatedOperation::name):
(Messages::WebPage::DeprecatedOperation::DeprecatedOperation):
(Messages::WebPage::DeprecatedOperation::arguments const):
(Messages::WebPage::ExperimentalOperation::name):
(Messages::WebPage::ExperimentalOperation::ExperimentalOperation):
(Messages::WebPage::ExperimentalOperation::arguments const):
(Messages::None::messageReceiverName): Deleted.

  • Scripts/testMessagesReplies.h:
  • Scripts/webkit/messages_unittest.py:
  • Scripts/webkit/test.messages.in: Added.
Location:
trunk/Source/WebKit
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r261269 r261270  
     1
     22020-05-06  Alex Christensen  <achristensen@webkit.org>
     3
     4        Fix webkitpy tests after r261254
     5        https://bugs.webkit.org/show_bug.cgi?id=211112
     6
     7        test.messages.in was accidentally deleted instead of moved, and messages_unittest.py needed to be told of the new locations of results.
     8        The rest is just running the generator to update results.
     9
     10        * Scripts/MessageNames.cpp:
     11        (IPC::description):
     12        (IPC::receiverName):
     13        (IPC::isValidMessageName):
     14        * Scripts/MessageNames.h:
     15        * Scripts/testMessageReceiver.cpp:
     16        (Messages::WebPage::GetPluginProcessConnection::send):
     17        (Messages::WebPage::TestMultipleAttributes::send):
     18        (WebKit::WebPage::didReceiveMessage):
     19        (WebKit::WebPage::didReceiveSyncMessage):
     20        * Scripts/testMessages.h:
     21        (Messages::WebPage::messageReceiverName):
     22        (Messages::WebPage::LoadURL::name):
     23        (Messages::WebPage::LoadURL::LoadURL):
     24        (Messages::WebPage::LoadURL::arguments const):
     25        (Messages::WebPage::LoadSomething::name):
     26        (Messages::WebPage::LoadSomething::LoadSomething):
     27        (Messages::WebPage::LoadSomething::arguments const):
     28        (Messages::WebPage::TouchEvent::name):
     29        (Messages::WebPage::TouchEvent::TouchEvent):
     30        (Messages::WebPage::TouchEvent::arguments const):
     31        (Messages::WebPage::AddEvent::name):
     32        (Messages::WebPage::AddEvent::AddEvent):
     33        (Messages::WebPage::AddEvent::arguments const):
     34        (Messages::WebPage::LoadSomethingElse::name):
     35        (Messages::WebPage::LoadSomethingElse::LoadSomethingElse):
     36        (Messages::WebPage::LoadSomethingElse::arguments const):
     37        (Messages::WebPage::DidReceivePolicyDecision::name):
     38        (Messages::WebPage::DidReceivePolicyDecision::DidReceivePolicyDecision):
     39        (Messages::WebPage::DidReceivePolicyDecision::arguments const):
     40        (Messages::WebPage::Close::name):
     41        (Messages::WebPage::Close::arguments const):
     42        (Messages::WebPage::PreferencesDidChange::name):
     43        (Messages::WebPage::PreferencesDidChange::PreferencesDidChange):
     44        (Messages::WebPage::PreferencesDidChange::arguments const):
     45        (Messages::WebPage::SendDoubleAndFloat::name):
     46        (Messages::WebPage::SendDoubleAndFloat::SendDoubleAndFloat):
     47        (Messages::WebPage::SendDoubleAndFloat::arguments const):
     48        (Messages::WebPage::SendInts::name):
     49        (Messages::WebPage::SendInts::SendInts):
     50        (Messages::WebPage::SendInts::arguments const):
     51        (Messages::WebPage::CreatePlugin::name):
     52        (Messages::WebPage::CreatePlugin::CreatePlugin):
     53        (Messages::WebPage::CreatePlugin::arguments const):
     54        (Messages::WebPage::RunJavaScriptAlert::name):
     55        (Messages::WebPage::RunJavaScriptAlert::RunJavaScriptAlert):
     56        (Messages::WebPage::RunJavaScriptAlert::arguments const):
     57        (Messages::WebPage::GetPlugins::name):
     58        (Messages::WebPage::GetPlugins::GetPlugins):
     59        (Messages::WebPage::GetPlugins::arguments const):
     60        (Messages::WebPage::GetPluginProcessConnection::name):
     61        (Messages::WebPage::GetPluginProcessConnection::GetPluginProcessConnection):
     62        (Messages::WebPage::GetPluginProcessConnection::arguments const):
     63        (Messages::WebPage::TestMultipleAttributes::name):
     64        (Messages::WebPage::TestMultipleAttributes::arguments const):
     65        (Messages::WebPage::TestParameterAttributes::name):
     66        (Messages::WebPage::TestParameterAttributes::TestParameterAttributes):
     67        (Messages::WebPage::TestParameterAttributes::arguments const):
     68        (Messages::WebPage::TemplateTest::name):
     69        (Messages::WebPage::TemplateTest::TemplateTest):
     70        (Messages::WebPage::TemplateTest::arguments const):
     71        (Messages::WebPage::SetVideoLayerID::name):
     72        (Messages::WebPage::SetVideoLayerID::SetVideoLayerID):
     73        (Messages::WebPage::SetVideoLayerID::arguments const):
     74        (Messages::WebPage::DidCreateWebProcessConnection::name):
     75        (Messages::WebPage::DidCreateWebProcessConnection::DidCreateWebProcessConnection):
     76        (Messages::WebPage::DidCreateWebProcessConnection::arguments const):
     77        (Messages::WebPage::InterpretKeyEvent::name):
     78        (Messages::WebPage::InterpretKeyEvent::InterpretKeyEvent):
     79        (Messages::WebPage::InterpretKeyEvent::arguments const):
     80        (Messages::WebPage::DeprecatedOperation::name):
     81        (Messages::WebPage::DeprecatedOperation::DeprecatedOperation):
     82        (Messages::WebPage::DeprecatedOperation::arguments const):
     83        (Messages::WebPage::ExperimentalOperation::name):
     84        (Messages::WebPage::ExperimentalOperation::ExperimentalOperation):
     85        (Messages::WebPage::ExperimentalOperation::arguments const):
     86        (Messages::None::messageReceiverName): Deleted.
     87        * Scripts/testMessagesReplies.h:
     88        * Scripts/webkit/messages_unittest.py:
     89        * Scripts/webkit/test.messages.in: Added.
     90
    1912020-05-06  Megan Gardner  <megan_gardner@apple.com>
    292

  • trunk/Source/WebKit/Scripts/MessageNames.cpp

    r261254 r261270  
    115115        return "WebPage::ExperimentalOperation";
    116116#endif
     117    case MessageName::WebPage_LoadURL:
     118        return "WebPage::LoadURL";
     119#if ENABLE(TOUCH_EVENTS)
     120    case MessageName::WebPage_LoadSomething:
     121        return "WebPage::LoadSomething";
     122#endif
     123#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
     124    case MessageName::WebPage_TouchEvent:
     125        return "WebPage::TouchEvent";
     126#endif
     127#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION))
     128    case MessageName::WebPage_AddEvent:
     129        return "WebPage::AddEvent";
     130#endif
     131#if ENABLE(TOUCH_EVENTS)
     132    case MessageName::WebPage_LoadSomethingElse:
     133        return "WebPage::LoadSomethingElse";
     134#endif
     135    case MessageName::WebPage_DidReceivePolicyDecision:
     136        return "WebPage::DidReceivePolicyDecision";
     137    case MessageName::WebPage_Close:
     138        return "WebPage::Close";
     139    case MessageName::WebPage_PreferencesDidChange:
     140        return "WebPage::PreferencesDidChange";
     141    case MessageName::WebPage_SendDoubleAndFloat:
     142        return "WebPage::SendDoubleAndFloat";
     143    case MessageName::WebPage_SendInts:
     144        return "WebPage::SendInts";
     145    case MessageName::WebPage_CreatePlugin:
     146        return "WebPage::CreatePlugin";
     147    case MessageName::WebPage_RunJavaScriptAlert:
     148        return "WebPage::RunJavaScriptAlert";
     149    case MessageName::WebPage_GetPlugins:
     150        return "WebPage::GetPlugins";
     151    case MessageName::WebPage_GetPluginProcessConnection:
     152        return "WebPage::GetPluginProcessConnection";
     153    case MessageName::WebPage_TestMultipleAttributes:
     154        return "WebPage::TestMultipleAttributes";
     155    case MessageName::WebPage_TestParameterAttributes:
     156        return "WebPage::TestParameterAttributes";
     157    case MessageName::WebPage_TemplateTest:
     158        return "WebPage::TemplateTest";
     159    case MessageName::WebPage_SetVideoLayerID:
     160        return "WebPage::SetVideoLayerID";
     161#if PLATFORM(MAC)
     162    case MessageName::WebPage_DidCreateWebProcessConnection:
     163        return "WebPage::DidCreateWebProcessConnection";
     164#endif
     165#if PLATFORM(MAC)
     166    case MessageName::WebPage_InterpretKeyEvent:
     167        return "WebPage::InterpretKeyEvent";
     168#endif
     169#if ENABLE(DEPRECATED_FEATURE)
     170    case MessageName::WebPage_DeprecatedOperation:
     171        return "WebPage::DeprecatedOperation";
     172#endif
     173#if ENABLE(EXPERIMENTAL_FEATURE)
     174    case MessageName::WebPage_ExperimentalOperation:
     175        return "WebPage::ExperimentalOperation";
     176#endif
    117177    case MessageName::WrappedAsyncMessageForTesting:
    118178        return "IPC::WrappedAsyncMessageForTesting";
    … …  
    183243#endif
    184244        return ReceiverName::WebPage;
    185         return ReceiverName::None;
     245    case MessageName::WebPage_LoadURL:
     246#if ENABLE(TOUCH_EVENTS)
     247    case MessageName::WebPage_LoadSomething:
     248#endif
     249#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
     250    case MessageName::WebPage_TouchEvent:
     251#endif
     252#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION))
     253    case MessageName::WebPage_AddEvent:
     254#endif
     255#if ENABLE(TOUCH_EVENTS)
     256    case MessageName::WebPage_LoadSomethingElse:
     257#endif
     258    case MessageName::WebPage_DidReceivePolicyDecision:
     259    case MessageName::WebPage_Close:
     260    case MessageName::WebPage_PreferencesDidChange:
     261    case MessageName::WebPage_SendDoubleAndFloat:
     262    case MessageName::WebPage_SendInts:
     263    case MessageName::WebPage_CreatePlugin:
     264    case MessageName::WebPage_RunJavaScriptAlert:
     265    case MessageName::WebPage_GetPlugins:
     266    case MessageName::WebPage_GetPluginProcessConnection:
     267    case MessageName::WebPage_TestMultipleAttributes:
     268    case MessageName::WebPage_TestParameterAttributes:
     269    case MessageName::WebPage_TemplateTest:
     270    case MessageName::WebPage_SetVideoLayerID:
     271#if PLATFORM(MAC)
     272    case MessageName::WebPage_DidCreateWebProcessConnection:
     273#endif
     274#if PLATFORM(MAC)
     275    case MessageName::WebPage_InterpretKeyEvent:
     276#endif
     277#if ENABLE(DEPRECATED_FEATURE)
     278    case MessageName::WebPage_DeprecatedOperation:
     279#endif
     280#if ENABLE(EXPERIMENTAL_FEATURE)
     281    case MessageName::WebPage_ExperimentalOperation:
     282#endif
     283        return ReceiverName::WebPage;
    186284#if ENABLE(TEST_FEATURE)
    187285    case MessageName::WebPage_TestAsyncMessageReply:
    … …  
    290388        return true;
    291389#endif
     390    if (messageName == IPC::MessageName::WebPage_LoadURL)
     391        return true;
     392#if ENABLE(TOUCH_EVENTS)
     393    if (messageName == IPC::MessageName::WebPage_LoadSomething)
     394        return true;
     395#endif
     396#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
     397    if (messageName == IPC::MessageName::WebPage_TouchEvent)
     398        return true;
     399#endif
     400#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION))
     401    if (messageName == IPC::MessageName::WebPage_AddEvent)
     402        return true;
     403#endif
     404#if ENABLE(TOUCH_EVENTS)
     405    if (messageName == IPC::MessageName::WebPage_LoadSomethingElse)
     406        return true;
     407#endif
     408    if (messageName == IPC::MessageName::WebPage_DidReceivePolicyDecision)
     409        return true;
     410    if (messageName == IPC::MessageName::WebPage_Close)
     411        return true;
     412    if (messageName == IPC::MessageName::WebPage_PreferencesDidChange)
     413        return true;
     414    if (messageName == IPC::MessageName::WebPage_SendDoubleAndFloat)
     415        return true;
     416    if (messageName == IPC::MessageName::WebPage_SendInts)
     417        return true;
     418    if (messageName == IPC::MessageName::WebPage_CreatePlugin)
     419        return true;
     420    if (messageName == IPC::MessageName::WebPage_RunJavaScriptAlert)
     421        return true;
     422    if (messageName == IPC::MessageName::WebPage_GetPlugins)
     423        return true;
     424    if (messageName == IPC::MessageName::WebPage_GetPluginProcessConnection)
     425        return true;
     426    if (messageName == IPC::MessageName::WebPage_TestMultipleAttributes)
     427        return true;
     428    if (messageName == IPC::MessageName::WebPage_TestParameterAttributes)
     429        return true;
     430    if (messageName == IPC::MessageName::WebPage_TemplateTest)
     431        return true;
     432    if (messageName == IPC::MessageName::WebPage_SetVideoLayerID)
     433        return true;
     434#if PLATFORM(MAC)
     435    if (messageName == IPC::MessageName::WebPage_DidCreateWebProcessConnection)
     436        return true;
     437#endif
     438#if PLATFORM(MAC)
     439    if (messageName == IPC::MessageName::WebPage_InterpretKeyEvent)
     440        return true;
     441#endif
     442#if ENABLE(DEPRECATED_FEATURE)
     443    if (messageName == IPC::MessageName::WebPage_DeprecatedOperation)
     444        return true;
     445#endif
     446#if ENABLE(EXPERIMENTAL_FEATURE)
     447    if (messageName == IPC::MessageName::WebPage_ExperimentalOperation)
     448        return true;
     449#endif
    292450    if (messageName == IPC::MessageName::WrappedAsyncMessageForTesting)
    293451        return true;

  • trunk/Source/WebKit/Scripts/MessageNames.h

    r261254 r261270  
    3232    WebPage = 1
    3333    , WebPage = 2
    34     , None = 3
     34    , WebPage = 3
    3535    , IPC = 4
    3636    , AsyncReply = 5
    … …  
    9292    , WebPage_ExperimentalOperation = 31
    9393#endif
    94     , WrappedAsyncMessageForTesting = 32
    95     , SyncMessageReply = 33
    96     , InitializeConnection = 34
    97     , LegacySessionState = 35
     94    , WebPage_LoadURL = 32
     95#if ENABLE(TOUCH_EVENTS)
     96    , WebPage_LoadSomething = 33
     97#endif
     98#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
     99    , WebPage_TouchEvent = 34
     100#endif
     101#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION))
     102    , WebPage_AddEvent = 35
     103#endif
     104#if ENABLE(TOUCH_EVENTS)
     105    , WebPage_LoadSomethingElse = 36
     106#endif
     107    , WebPage_DidReceivePolicyDecision = 37
     108    , WebPage_Close = 38
     109    , WebPage_PreferencesDidChange = 39
     110    , WebPage_SendDoubleAndFloat = 40
     111    , WebPage_SendInts = 41
     112    , WebPage_CreatePlugin = 42
     113    , WebPage_RunJavaScriptAlert = 43
     114    , WebPage_GetPlugins = 44
     115    , WebPage_GetPluginProcessConnection = 45
     116    , WebPage_TestMultipleAttributes = 46
     117    , WebPage_TestParameterAttributes = 47
     118    , WebPage_TemplateTest = 48
     119    , WebPage_SetVideoLayerID = 49
     120#if PLATFORM(MAC)
     121    , WebPage_DidCreateWebProcessConnection = 50
     122#endif
     123#if PLATFORM(MAC)
     124    , WebPage_InterpretKeyEvent = 51
     125#endif
     126#if ENABLE(DEPRECATED_FEATURE)
     127    , WebPage_DeprecatedOperation = 52
     128#endif
     129#if ENABLE(EXPERIMENTAL_FEATURE)
     130    , WebPage_ExperimentalOperation = 53
     131#endif
     132    , WrappedAsyncMessageForTesting = 54
     133    , SyncMessageReply = 55
     134    , InitializeConnection = 56
     135    , LegacySessionState = 57
    98136};
    99137

  • trunk/Source/WebKit/Scripts/testMessageReceiver.cpp

    r261254 r261270  
    2525#include "config.h"
    2626
    27 #include "None.h"
    28 
     27#if (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))
     28
     29#include "WebPage.h"
     30
     31#include "ArgumentCoders.h"
     32#include "Connection.h"
    2933#include "Decoder.h"
     34#if ENABLE(DEPRECATED_FEATURE) || ENABLE(EXPERIMENTAL_FEATURE)
     35#include "DummyType.h"
     36#endif
    3037#include "HandleMessage.h"
    31 #include "NoneMessages.h"
     38#if PLATFORM(MAC)
     39#include "MachPort.h"
     40#endif
     41#include "Plugin.h"
     42#include "WebCoreArgumentCoders.h"
     43#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION)) || (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
     44#include "WebEvent.h"
     45#endif
     46#include "WebPageMessages.h"
     47#include "WebPreferencesStore.h"
     48#include <WebCore/GraphicsLayer.h>
     49#if PLATFORM(MAC)
     50#include <WebCore/KeyboardEvent.h>
     51#endif
     52#include <WebCore/PluginData.h>
     53#include <utility>
     54#include <wtf/HashMap.h>
     55#include <wtf/Vector.h>
     56#include <wtf/text/WTFString.h>
     57
     58namespace Messages {
     59
     60namespace WebPage {
     61
     62void GetPluginProcessConnection::send(std::unique_ptr<IPC::Encoder>&& encoder, IPC::Connection& connection, const IPC::Connection::Handle& connectionHandle)
     63{
     64    *encoder << connectionHandle;
     65    connection.sendSyncReply(WTFMove(encoder));
     66}
     67
     68void TestMultipleAttributes::send(std::unique_ptr<IPC::Encoder>&& encoder, IPC::Connection& connection)
     69{
     70    connection.sendSyncReply(WTFMove(encoder));
     71}
     72
     73} // namespace WebPage
     74
     75} // namespace Messages
    3276
    3377namespace WebKit {
    3478
     79void WebPage::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
     80{
     81    auto protectedThis = makeRef(*this);
     82    if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
     83        IPC::handleMessage<Messages::WebPage::LoadURL>(decoder, this, &WebPage::loadURL);
     84        return;
     85    }
     86#if ENABLE(TOUCH_EVENTS)
     87    if (decoder.messageName() == Messages::WebPage::LoadSomething::name()) {
     88        IPC::handleMessage<Messages::WebPage::LoadSomething>(decoder, this, &WebPage::loadSomething);
     89        return;
     90    }
     91#endif
     92#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
     93    if (decoder.messageName() == Messages::WebPage::TouchEvent::name()) {
     94        IPC::handleMessage<Messages::WebPage::TouchEvent>(decoder, this, &WebPage::touchEvent);
     95        return;
     96    }
     97#endif
     98#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION))
     99    if (decoder.messageName() == Messages::WebPage::AddEvent::name()) {
     100        IPC::handleMessage<Messages::WebPage::AddEvent>(decoder, this, &WebPage::addEvent);
     101        return;
     102    }
     103#endif
     104#if ENABLE(TOUCH_EVENTS)
     105    if (decoder.messageName() == Messages::WebPage::LoadSomethingElse::name()) {
     106        IPC::handleMessage<Messages::WebPage::LoadSomethingElse>(decoder, this, &WebPage::loadSomethingElse);
     107        return;
     108    }
     109#endif
     110    if (decoder.messageName() == Messages::WebPage::DidReceivePolicyDecision::name()) {
     111        IPC::handleMessage<Messages::WebPage::DidReceivePolicyDecision>(decoder, this, &WebPage::didReceivePolicyDecision);
     112        return;
     113    }
     114    if (decoder.messageName() == Messages::WebPage::Close::name()) {
     115        IPC::handleMessage<Messages::WebPage::Close>(decoder, this, &WebPage::close);
     116        return;
     117    }
     118    if (decoder.messageName() == Messages::WebPage::PreferencesDidChange::name()) {
     119        IPC::handleMessage<Messages::WebPage::PreferencesDidChange>(decoder, this, &WebPage::preferencesDidChange);
     120        return;
     121    }
     122    if (decoder.messageName() == Messages::WebPage::SendDoubleAndFloat::name()) {
     123        IPC::handleMessage<Messages::WebPage::SendDoubleAndFloat>(decoder, this, &WebPage::sendDoubleAndFloat);
     124        return;
     125    }
     126    if (decoder.messageName() == Messages::WebPage::SendInts::name()) {
     127        IPC::handleMessage<Messages::WebPage::SendInts>(decoder, this, &WebPage::sendInts);
     128        return;
     129    }
     130    if (decoder.messageName() == Messages::WebPage::TestParameterAttributes::name()) {
     131        IPC::handleMessage<Messages::WebPage::TestParameterAttributes>(decoder, this, &WebPage::testParameterAttributes);
     132        return;
     133    }
     134    if (decoder.messageName() == Messages::WebPage::TemplateTest::name()) {
     135        IPC::handleMessage<Messages::WebPage::TemplateTest>(decoder, this, &WebPage::templateTest);
     136        return;
     137    }
     138    if (decoder.messageName() == Messages::WebPage::SetVideoLayerID::name()) {
     139        IPC::handleMessage<Messages::WebPage::SetVideoLayerID>(decoder, this, &WebPage::setVideoLayerID);
     140        return;
     141    }
     142#if PLATFORM(MAC)
     143    if (decoder.messageName() == Messages::WebPage::DidCreateWebProcessConnection::name()) {
     144        IPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(decoder, this, &WebPage::didCreateWebProcessConnection);
     145        return;
     146    }
     147#endif
     148#if ENABLE(DEPRECATED_FEATURE)
     149    if (decoder.messageName() == Messages::WebPage::DeprecatedOperation::name()) {
     150        IPC::handleMessage<Messages::WebPage::DeprecatedOperation>(decoder, this, &WebPage::deprecatedOperation);
     151        return;
     152    }
     153#endif
     154#if ENABLE(EXPERIMENTAL_FEATURE)
     155    if (decoder.messageName() == Messages::WebPage::ExperimentalOperation::name()) {
     156        IPC::handleMessage<Messages::WebPage::ExperimentalOperation>(decoder, this, &WebPage::experimentalOperation);
     157        return;
     158    }
     159#endif
     160    UNUSED_PARAM(connection);
     161    UNUSED_PARAM(decoder);
     162    ASSERT_NOT_REACHED();
     163}
     164
     165void WebPage::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
     166{
     167    auto protectedThis = makeRef(*this);
     168    if (decoder.messageName() == Messages::WebPage::CreatePlugin::name()) {
     169        IPC::handleMessage<Messages::WebPage::CreatePlugin>(decoder, *replyEncoder, this, &WebPage::createPlugin);
     170        return;
     171    }
     172    if (decoder.messageName() == Messages::WebPage::RunJavaScriptAlert::name()) {
     173        IPC::handleMessage<Messages::WebPage::RunJavaScriptAlert>(decoder, *replyEncoder, this, &WebPage::runJavaScriptAlert);
     174        return;
     175    }
     176    if (decoder.messageName() == Messages::WebPage::GetPlugins::name()) {
     177        IPC::handleMessage<Messages::WebPage::GetPlugins>(decoder, *replyEncoder, this, &WebPage::getPlugins);
     178        return;
     179    }
     180    if (decoder.messageName() == Messages::WebPage::GetPluginProcessConnection::name()) {
     181        IPC::handleMessageSynchronous<Messages::WebPage::GetPluginProcessConnection>(connection, decoder, replyEncoder, this, &WebPage::getPluginProcessConnection);
     182        return;
     183    }
     184    if (decoder.messageName() == Messages::WebPage::TestMultipleAttributes::name()) {
     185        IPC::handleMessageSynchronousWantsConnection<Messages::WebPage::TestMultipleAttributes>(connection, decoder, replyEncoder, this, &WebPage::testMultipleAttributes);
     186        return;
     187    }
     188#if PLATFORM(MAC)
     189    if (decoder.messageName() == Messages::WebPage::InterpretKeyEvent::name()) {
     190        IPC::handleMessage<Messages::WebPage::InterpretKeyEvent>(decoder, *replyEncoder, this, &WebPage::interpretKeyEvent);
     191        return;
     192    }
     193#endif
     194    UNUSED_PARAM(connection);
     195    UNUSED_PARAM(decoder);
     196    UNUSED_PARAM(replyEncoder);
     197    ASSERT_NOT_REACHED();
     198}
    35199
    36200} // namespace WebKit
    37201
     202
     203#endif // (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))

  • trunk/Source/WebKit/Scripts/testMessages.h

    r261254 r261270  
    2525#pragma once
    2626
     27#if (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))
     28
    2729#include "ArgumentCoders.h"
    2830#include "Connection.h"
    2931#include "MessageNames.h"
    30 #include "NoneMessagesReplies.h"
     32#include "Plugin.h"
     33#include "WebPageMessagesReplies.h"
     34#include <WebCore/GraphicsLayer.h>
     35#include <WebCore/KeyboardEvent.h>
     36#include <WebCore/PluginData.h>
     37#include <utility>
    3138#include <wtf/Forward.h>
     39#include <wtf/HashMap.h>
    3240#include <wtf/ThreadSafeRefCounted.h>
    33 
     41#include <wtf/Vector.h>
     42#include <wtf/text/WTFString.h>
     43
     44namespace IPC {
     45class DummyType;
     46class MachPort;
     47}
     48
     49namespace WebKit {
     50class WebPreferencesStore;
     51class WebTouchEvent;
     52}
    3453
    3554namespace Messages {
    36 namespace None {
     55namespace WebPage {
    3756
    3857static inline IPC::ReceiverName messageReceiverName()
    3958{
    40     return IPC::ReceiverName::None;
     59    return IPC::ReceiverName::WebPage;
    4160}
    4261
    43 
    44 } // namespace None
     62class LoadURL {
     63public:
     64    typedef std::tuple<const String&> Arguments;
     65
     66    static IPC::MessageName name() { return IPC::MessageName::WebPage_LoadURL; }
     67    static const bool isSync = false;
     68
     69    explicit LoadURL(const String& url)
     70        : m_arguments(url)
     71    {
     72    }
     73
     74    const Arguments& arguments() const
     75    {
     76        return m_arguments;
     77    }
     78
     79private:
     80    Arguments m_arguments;
     81};
     82
     83#if ENABLE(TOUCH_EVENTS)
     84class LoadSomething {
     85public:
     86    typedef std::tuple<const String&> Arguments;
     87
     88    static IPC::MessageName name() { return IPC::MessageName::WebPage_LoadSomething; }
     89    static const bool isSync = false;
     90
     91    explicit LoadSomething(const String& url)
     92        : m_arguments(url)
     93    {
     94    }
     95
     96    const Arguments& arguments() const
     97    {
     98        return m_arguments;
     99    }
     100
     101private:
     102    Arguments m_arguments;
     103};
     104#endif
     105
     106#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
     107class TouchEvent {
     108public:
     109    typedef std::tuple<const WebKit::WebTouchEvent&> Arguments;
     110
     111    static IPC::MessageName name() { return IPC::MessageName::WebPage_TouchEvent; }
     112    static const bool isSync = false;
     113
     114    explicit TouchEvent(const WebKit::WebTouchEvent& event)
     115        : m_arguments(event)
     116    {
     117    }
     118
     119    const Arguments& arguments() const
     120    {
     121        return m_arguments;
     122    }
     123
     124private:
     125    Arguments m_arguments;
     126};
     127#endif
     128
     129#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION))
     130class AddEvent {
     131public:
     132    typedef std::tuple<const WebKit::WebTouchEvent&> Arguments;
     133
     134    static IPC::MessageName name() { return IPC::MessageName::WebPage_AddEvent; }
     135    static const bool isSync = false;
     136
     137    explicit AddEvent(const WebKit::WebTouchEvent& event)
     138        : m_arguments(event)
     139    {
     140    }
     141
     142    const Arguments& arguments() const
     143    {
     144        return m_arguments;
     145    }
     146
     147private:
     148    Arguments m_arguments;
     149};
     150#endif
     151
     152#if ENABLE(TOUCH_EVENTS)
     153class LoadSomethingElse {
     154public:
     155    typedef std::tuple<const String&> Arguments;
     156
     157    static IPC::MessageName name() { return IPC::MessageName::WebPage_LoadSomethingElse; }
     158    static const bool isSync = false;
     159
     160    explicit LoadSomethingElse(const String& url)
     161        : m_arguments(url)
     162    {
     163    }
     164
     165    const Arguments& arguments() const
     166    {
     167        return m_arguments;
     168    }
     169
     170private:
     171    Arguments m_arguments;
     172};
     173#endif
     174
     175class DidReceivePolicyDecision {
     176public:
     177    typedef std::tuple<uint64_t, uint64_t, uint32_t> Arguments;
     178
     179    static IPC::MessageName name() { return IPC::MessageName::WebPage_DidReceivePolicyDecision; }
     180    static const bool isSync = false;
     181
     182    DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction)
     183        : m_arguments(frameID, listenerID, policyAction)
     184    {
     185    }
     186
     187    const Arguments& arguments() const
     188    {
     189        return m_arguments;
     190    }
     191
     192private:
     193    Arguments m_arguments;
     194};
     195
     196class Close {
     197public:
     198    typedef std::tuple<> Arguments;
     199
     200    static IPC::MessageName name() { return IPC::MessageName::WebPage_Close; }
     201    static const bool isSync = false;
     202
     203    const Arguments& arguments() const
     204    {
     205        return m_arguments;
     206    }
     207
     208private:
     209    Arguments m_arguments;
     210};
     211
     212class PreferencesDidChange {
     213public:
     214    typedef std::tuple<const WebKit::WebPreferencesStore&> Arguments;
     215
     216    static IPC::MessageName name() { return IPC::MessageName::WebPage_PreferencesDidChange; }
     217    static const bool isSync = false;
     218
     219    explicit PreferencesDidChange(const WebKit::WebPreferencesStore& store)
     220        : m_arguments(store)
     221    {
     222    }
     223
     224    const Arguments& arguments() const
     225    {
     226        return m_arguments;
     227    }
     228
     229private:
     230    Arguments m_arguments;
     231};
     232
     233class SendDoubleAndFloat {
     234public:
     235    typedef std::tuple<double, float> Arguments;
     236
     237    static IPC::MessageName name() { return IPC::MessageName::WebPage_SendDoubleAndFloat; }
     238    static const bool isSync = false;
     239
     240    SendDoubleAndFloat(double d, float f)
     241        : m_arguments(d, f)
     242    {
     243    }
     244
     245    const Arguments& arguments() const
     246    {
     247        return m_arguments;
     248    }
     249
     250private:
     251    Arguments m_arguments;
     252};
     253
     254class SendInts {
     255public:
     256    typedef std::tuple<const Vector<uint64_t>&, const Vector<Vector<uint64_t>>&> Arguments;
     257
     258    static IPC::MessageName name() { return IPC::MessageName::WebPage_SendInts; }
     259    static const bool isSync = false;
     260
     261    SendInts(const Vector<uint64_t>& ints, const Vector<Vector<uint64_t>>& intVectors)
     262        : m_arguments(ints, intVectors)
     263    {
     264    }
     265
     266    const Arguments& arguments() const
     267    {
     268        return m_arguments;
     269    }
     270
     271private:
     272    Arguments m_arguments;
     273};
     274
     275class CreatePlugin {
     276public:
     277    typedef std::tuple<uint64_t, const WebKit::Plugin::Parameters&> Arguments;
     278
     279    static IPC::MessageName name() { return IPC::MessageName::WebPage_CreatePlugin; }
     280    static const bool isSync = true;
     281
     282    using Reply = std::tuple<bool&>;
     283    using ReplyArguments = std::tuple<bool>;
     284    CreatePlugin(uint64_t pluginInstanceID, const WebKit::Plugin::Parameters& parameters)
     285        : m_arguments(pluginInstanceID, parameters)
     286    {
     287    }
     288
     289    const Arguments& arguments() const
     290    {
     291        return m_arguments;
     292    }
     293
     294private:
     295    Arguments m_arguments;
     296};
     297
     298class RunJavaScriptAlert {
     299public:
     300    typedef std::tuple<uint64_t, const String&> Arguments;
     301
     302    static IPC::MessageName name() { return IPC::MessageName::WebPage_RunJavaScriptAlert; }
     303    static const bool isSync = true;
     304
     305    using Reply = std::tuple<>;
     306    using ReplyArguments = std::tuple<>;
     307    RunJavaScriptAlert(uint64_t frameID, const String& message)
     308        : m_arguments(frameID, message)
     309    {
     310    }
     311
     312    const Arguments& arguments() const
     313    {
     314        return m_arguments;
     315    }
     316
     317private:
     318    Arguments m_arguments;
     319};
     320
     321class GetPlugins {
     322public:
     323    typedef std::tuple<bool> Arguments;
     324
     325    static IPC::MessageName name() { return IPC::MessageName::WebPage_GetPlugins; }
     326    static const bool isSync = true;
     327
     328    using Reply = std::tuple<Vector<WebCore::PluginInfo>&>;
     329    using ReplyArguments = std::tuple<Vector<WebCore::PluginInfo>>;
     330    explicit GetPlugins(bool refresh)
     331        : m_arguments(refresh)
     332    {
     333    }
     334
     335    const Arguments& arguments() const
     336    {
     337        return m_arguments;
     338    }
     339
     340private:
     341    Arguments m_arguments;
     342};
     343
     344class GetPluginProcessConnection {
     345public:
     346    typedef std::tuple<const String&> Arguments;
     347
     348    static IPC::MessageName name() { return IPC::MessageName::WebPage_GetPluginProcessConnection; }
     349    static const bool isSync = true;
     350
     351    using DelayedReply = GetPluginProcessConnectionDelayedReply;
     352    static void send(std::unique_ptr<IPC::Encoder>&&, IPC::Connection&, const IPC::Connection::Handle& connectionHandle);
     353    using Reply = std::tuple<IPC::Connection::Handle&>;
     354    using ReplyArguments = std::tuple<IPC::Connection::Handle>;
     355    explicit GetPluginProcessConnection(const String& pluginPath)
     356        : m_arguments(pluginPath)
     357    {
     358    }
     359
     360    const Arguments& arguments() const
     361    {
     362        return m_arguments;
     363    }
     364
     365private:
     366    Arguments m_arguments;
     367};
     368
     369class TestMultipleAttributes {
     370public:
     371    typedef std::tuple<> Arguments;
     372
     373    static IPC::MessageName name() { return IPC::MessageName::WebPage_TestMultipleAttributes; }
     374    static const bool isSync = true;
     375
     376    using DelayedReply = TestMultipleAttributesDelayedReply;
     377    static void send(std::unique_ptr<IPC::Encoder>&&, IPC::Connection&);
     378    using Reply = std::tuple<>;
     379    using ReplyArguments = std::tuple<>;
     380    const Arguments& arguments() const
     381    {
     382        return m_arguments;
     383    }
     384
     385private:
     386    Arguments m_arguments;
     387};
     388
     389class TestParameterAttributes {
     390public:
     391    typedef std::tuple<uint64_t, double, double> Arguments;
     392
     393    static IPC::MessageName name() { return IPC::MessageName::WebPage_TestParameterAttributes; }
     394    static const bool isSync = false;
     395
     396    TestParameterAttributes(uint64_t foo, double bar, double baz)
     397        : m_arguments(foo, bar, baz)
     398    {
     399    }
     400
     401    const Arguments& arguments() const
     402    {
     403        return m_arguments;
     404    }
     405
     406private:
     407    Arguments m_arguments;
     408};
     409
     410class TemplateTest {
     411public:
     412    typedef std::tuple<const HashMap<String, std::pair<String, uint64_t>>&> Arguments;
     413
     414    static IPC::MessageName name() { return IPC::MessageName::WebPage_TemplateTest; }
     415    static const bool isSync = false;
     416
     417    explicit TemplateTest(const HashMap<String, std::pair<String, uint64_t>>& a)
     418        : m_arguments(a)
     419    {
     420    }
     421
     422    const Arguments& arguments() const
     423    {
     424        return m_arguments;
     425    }
     426
     427private:
     428    Arguments m_arguments;
     429};
     430
     431class SetVideoLayerID {
     432public:
     433    typedef std::tuple<const WebCore::GraphicsLayer::PlatformLayerID&> Arguments;
     434
     435    static IPC::MessageName name() { return IPC::MessageName::WebPage_SetVideoLayerID; }
     436    static const bool isSync = false;
     437
     438    explicit SetVideoLayerID(const WebCore::GraphicsLayer::PlatformLayerID& videoLayerID)
     439        : m_arguments(videoLayerID)
     440    {
     441    }
     442
     443    const Arguments& arguments() const
     444    {
     445        return m_arguments;
     446    }
     447
     448private:
     449    Arguments m_arguments;
     450};
     451
     452#if PLATFORM(MAC)
     453class DidCreateWebProcessConnection {
     454public:
     455    typedef std::tuple<const IPC::MachPort&> Arguments;
     456
     457    static IPC::MessageName name() { return IPC::MessageName::WebPage_DidCreateWebProcessConnection; }
     458    static const bool isSync = false;
     459
     460    explicit DidCreateWebProcessConnection(const IPC::MachPort& connectionIdentifier)
     461        : m_arguments(connectionIdentifier)
     462    {
     463    }
     464
     465    const Arguments& arguments() const
     466    {
     467        return m_arguments;
     468    }
     469
     470private:
     471    Arguments m_arguments;
     472};
     473#endif
     474
     475#if PLATFORM(MAC)
     476class InterpretKeyEvent {
     477public:
     478    typedef std::tuple<uint32_t> Arguments;
     479
     480    static IPC::MessageName name() { return IPC::MessageName::WebPage_InterpretKeyEvent; }
     481    static const bool isSync = true;
     482
     483    using Reply = std::tuple<Vector<WebCore::KeypressCommand>&>;
     484    using ReplyArguments = std::tuple<Vector<WebCore::KeypressCommand>>;
     485    explicit InterpretKeyEvent(uint32_t type)
     486        : m_arguments(type)
     487    {
     488    }
     489
     490    const Arguments& arguments() const
     491    {
     492        return m_arguments;
     493    }
     494
     495private:
     496    Arguments m_arguments;
     497};
     498#endif
     499
     500#if ENABLE(DEPRECATED_FEATURE)
     501class DeprecatedOperation {
     502public:
     503    typedef std::tuple<const IPC::DummyType&> Arguments;
     504
     505    static IPC::MessageName name() { return IPC::MessageName::WebPage_DeprecatedOperation; }
     506    static const bool isSync = false;
     507
     508    explicit DeprecatedOperation(const IPC::DummyType& dummy)
     509        : m_arguments(dummy)
     510    {
     511    }
     512
     513    const Arguments& arguments() const
     514    {
     515        return m_arguments;
     516    }
     517
     518private:
     519    Arguments m_arguments;
     520};
     521#endif
     522
     523#if ENABLE(EXPERIMENTAL_FEATURE)
     524class ExperimentalOperation {
     525public:
     526    typedef std::tuple<const IPC::DummyType&> Arguments;
     527
     528    static IPC::MessageName name() { return IPC::MessageName::WebPage_ExperimentalOperation; }
     529    static const bool isSync = false;
     530
     531    explicit ExperimentalOperation(const IPC::DummyType& dummy)
     532        : m_arguments(dummy)
     533    {
     534    }
     535
     536    const Arguments& arguments() const
     537    {
     538        return m_arguments;
     539    }
     540
     541private:
     542    Arguments m_arguments;
     543};
     544#endif
     545
     546} // namespace WebPage
    45547} // namespace Messages
     548
     549#endif // (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))

  • trunk/Source/WebKit/Scripts/testMessagesReplies.h

    r261254 r261270  
    2525#pragma once
    2626
     27#if (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))
     28
     29#include "Connection.h"
    2730#include "MessageNames.h"
    2831#include <wtf/Forward.h>
    … …  
    3033
    3134namespace Messages {
    32 namespace None {
     35namespace WebPage {
    3336
     37using GetPluginProcessConnectionDelayedReply = CompletionHandler<void(const IPC::Connection::Handle& connectionHandle)>;
    3438
    35 } // namespace None
     39using TestMultipleAttributesDelayedReply = CompletionHandler<void()>;
     40
     41} // namespace WebPage
    3642} // namespace Messages
     43
     44#endif // (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))

  • trunk/Source/WebKit/Scripts/webkit/messages_unittest.py

    r253219 r261270  
    3939reset_results = False
    4040
    41 with open(os.path.join(script_directory, 'test-messages.in')) as in_file:
     41with open(os.path.join(script_directory, 'test.messages.in')) as in_file:
    4242    _messages_file_contents = in_file.read()
    4343
    44 with open(os.path.join(script_directory, 'test-legacy-messages.in')) as in_file:
     44with open(os.path.join(script_directory, 'test-legacy.messages.in')) as in_file:
    4545    _legacy_messages_file_contents = in_file.read()
    4646
    47 with open(os.path.join(script_directory, 'test-superclass-messages.in')) as in_file:
     47with open(os.path.join(script_directory, 'test-superclass.messages.in')) as in_file:
    4848    _superclass_messages_file_contents = in_file.read()
    4949
    50 _expected_receiver_header_file_name = 'Messages-expected.h'
    51 _expected_legacy_receiver_header_file_name = 'LegacyMessages-expected.h'
    52 _expected_superclass_receiver_header_file_name = 'MessagesSuperclass-expected.h'
    53 
    54 _expected_receiver_implementation_file_name = 'MessageReceiver-expected.cpp'
    55 _expected_legacy_receiver_implementation_file_name = 'LegacyMessageReceiver-expected.cpp'
    56 _expected_superclass_receiver_implementation_file_name = 'MessageReceiverSuperclass-expected.cpp'
     50_expected_receiver_header_file_name = '../testMessages.h'
     51_expected_legacy_receiver_header_file_name = '../test-legacyMessages.h'
     52_expected_superclass_receiver_header_file_name = '../test-superclassMessages.h'
     53
     54_expected_receiver_implementation_file_name = '../testMessageReceiver.cpp'
     55_expected_legacy_receiver_implementation_file_name = '../test-legacyMessageReceiver.cpp'
     56_expected_superclass_receiver_implementation_file_name = '../test-superclassMessageReceiver.cpp'
    5757
    5858_expected_results = {
Note: See TracChangeset for help on using the changeset viewer.