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 --- WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp') diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp index 3a6229f..8ebdbae 100644 --- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp +++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp @@ -67,6 +67,7 @@ void LayoutTestController::reset() m_globalFlag = false; m_userStyleSheetEnabled = false; m_desktopNotificationAllowedOrigins.clear(); + m_ignoreDesktopNotification = false; DumpRenderTreeSupportQt::dumpEditingCallbacks(false); DumpRenderTreeSupportQt::dumpFrameLoader(false); @@ -193,9 +194,14 @@ void LayoutTestController::grantDesktopNotificationPermission(const QString& ori m_desktopNotificationAllowedOrigins.append(origin); } +void LayoutTestController::ignoreDesktopNotificationPermissionRequests() +{ + m_ignoreDesktopNotification = true; +} + bool LayoutTestController::checkDesktopNotificationPermission(const QString& origin) { - return m_desktopNotificationAllowedOrigins.contains(origin); + return !m_ignoreDesktopNotification && m_desktopNotificationAllowedOrigins.contains(origin); } void LayoutTestController::display() -- cgit v1.1