Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1

1 files changed, 7 insertions, 1 deletions

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()