diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
| commit | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WebKit2/Scripts/webkit/Messages-expected.h | |
| parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
| parent | 5087e0ced43d813eb6f765913a6fc3958d2a7a9d (diff) | |
| download | qtwebkit-81cbb264cb9446c4408124d50aeff50164ad0ab4.tar.gz | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I4e185b15690118515df80a79b786cbb8b30dd144
Diffstat (limited to 'Source/WebKit2/Scripts/webkit/Messages-expected.h')
| -rw-r--r-- | Source/WebKit2/Scripts/webkit/Messages-expected.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/Source/WebKit2/Scripts/webkit/Messages-expected.h b/Source/WebKit2/Scripts/webkit/Messages-expected.h index 6397c1043..50e1ca41f 100644 --- a/Source/WebKit2/Scripts/webkit/Messages-expected.h +++ b/Source/WebKit2/Scripts/webkit/Messages-expected.h @@ -27,13 +27,27 @@ #if (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND)) +#include "ArgumentCoders.h" #include "Arguments.h" #include "Connection.h" +#if ENABLE(DEPRECATED_FEATURE) || ENABLE(EXPERIMENTAL_FEATURE) +#include "DummyType.h" +#endif +#if PLATFORM(MAC) +#include "MachPort.h" +#endif #include "MessageEncoder.h" #include "Plugin.h" #include "StringReference.h" +#include "WebCoreArgumentCoders.h" +#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION)) || (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION)) +#include "WebEvent.h" +#endif +#include "WebPreferencesStore.h" #include <WebCore/GraphicsLayer.h> +#if PLATFORM(MAC) #include <WebCore/KeyboardEvent.h> +#endif #include <WebCore/PluginData.h> #include <utility> #include <wtf/HashMap.h> @@ -43,17 +57,6 @@ namespace IPC { class Connection; - class DummyType; - class MachPort; -} - -namespace WTF { - class String; -} - -namespace WebKit { - struct WebPreferencesStore; - class WebTouchEvent; } namespace Messages { |