diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-24 22:40:03 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-25 18:29:55 +0000 |
commit | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (patch) | |
tree | 02bd448d49627f059df0d8036fbdb9d9ee883a50 /Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.h | |
parent | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (diff) | |
download | qtwebkit-4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4.tar.gz |
Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.h')
-rw-r--r-- | Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.h b/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.h index 3c466f040..bd94afed6 100644 --- a/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.h +++ b/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.h @@ -53,24 +53,24 @@ public: bool navigatorQtObjectEnabled() const { return m_navigatorQtObjectEnabled; } void setNavigatorQtObjectEnabled(bool); -#ifdef HAVE_WEBCHANNEL - void postMessageFromNavigatorQtWebChannelTransport(WKStringRef message); - void didReceiveMessageToNavigatorQtWebChannelTransport(WKStringRef message); +#if ENABLE(QT_WEBCHANNEL) + void postMessageFromNavigatorQtWebChannelTransport(WKDataRef message); + void didReceiveMessageToNavigatorQtWebChannelTransport(WKDataRef message); #endif private: void registerNavigatorQtObject(JSGlobalContextRef); -#ifdef HAVE_WEBCHANNEL +#if ENABLE(QT_WEBCHANNEL) void registerNavigatorQtWebChannelTransportObject(JSGlobalContextRef); #endif - void postNavigatorMessage(WKStringRef messageName, WKStringRef message); + void postNavigatorMessage(WKStringRef messageName, WKTypeRef message); QtBuiltinBundle* m_bundle; WKBundlePageRef m_page; JSObjectRef m_navigatorQtObject; bool m_navigatorQtObjectEnabled; -#ifdef HAVE_WEBCHANNEL +#if ENABLE(QT_WEBCHANNEL) JSObjectRef m_navigatorQtWebChannelTransportObject; #endif }; |