From 0617145a89917ae7735fe1c9538688ab9a577df5 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Fri, 30 Jul 2010 10:46:49 +0100 Subject: Merge WebKit at r64264 : Initial merge by git. Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1 --- WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h') diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h index 188c405..3a92158 100644 --- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h +++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h @@ -32,17 +32,6 @@ class QWebPage; class QWebHistoryItem; class QWebScriptWorld; -enum NotificationPermission { - NotificationAllowed, - NotificationNotAllowed, - NotificationDenied -}; - -typedef void (CheckPermissionFunctionType) (QObject* receiver, const QUrl&, NotificationPermission&); -typedef void (RequestPermissionFunctionType) (QObject* receiver, const QString&); - -extern CheckPermissionFunctionType* checkPermissionFunction; -extern RequestPermissionFunctionType* requestPermissionFunction; extern QMap m_worldMap; class QWEBKIT_EXPORT DumpRenderTreeSupportQt { @@ -123,13 +112,6 @@ public: static void dumpNotification(bool b); - // These functions should eventually turn into public API - // and the "receiver" concept would go away - static void setNotificationsReceiver(QObject* receiver); - static void allowNotificationForOrigin(const QString& origin); - static void setCheckPermissionFunction(CheckPermissionFunctionType*); - static void setRequestPermissionFunction(RequestPermissionFunctionType*); - static QMap getChildHistoryItems(const QWebHistoryItem& historyItem); static bool isTargetItem(const QWebHistoryItem& historyItem); static QString historyItemTarget(const QWebHistoryItem& historyItem); -- cgit v1.1