Merge webkit.org at R49305 : Automatic merge by git.

Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7

1 files changed, 29 insertions, 0 deletions

diff --git a/WebKitTools/DumpRenderTree/win/UIDelegate.cpp b/WebKitTools/DumpRenderTree/win/UIDelegate.cpp
index 63f5441..b78fd3e 100755
--- a/WebKitTools/DumpRenderTree/win/UIDelegate.cpp
+++ b/WebKitTools/DumpRenderTree/win/UIDelegate.cpp
@@ -33,6 +33,7 @@
 #include "DraggingInfo.h"
 #include "EventSender.h"
 #include "LayoutTestController.h"
+#include "DRTDesktopNotificationPresenter.h"
 
 #include <WebCore/COMPtr.h>
 #include <wtf/Platform.h>
@@ -155,6 +156,7 @@ void DRTUndoManager::undo()
 UIDelegate::UIDelegate()
     : m_refCount(1)
     , m_undoManager(new DRTUndoManager)
+    , m_desktopNotifications(new DRTDesktopNotificationPresenter)
 {
     m_frame.bottom = 0;
     m_frame.top = 0;
@@ -174,6 +176,8 @@ HRESULT STDMETHODCALLTYPE UIDelegate::QueryInterface(REFIID riid, void** ppvObje
         *ppvObject = static_cast<IWebUIDelegate*>(this);
     else if (IsEqualGUID(riid, IID_IWebUIDelegate))
         *ppvObject = static_cast<IWebUIDelegate*>(this);
+    else if (IsEqualGUID(riid, IID_IWebUIDelegate2))
+        *ppvObject = static_cast<IWebUIDelegate2*>(this);
     else if (IsEqualGUID(riid, IID_IWebUIDelegatePrivate))
         *ppvObject = static_cast<IWebUIDelegatePrivate*>(this);
     else
@@ -499,6 +503,11 @@ HRESULT STDMETHODCALLTYPE UIDelegate::doDragDrop(
 
     draggingInfo = new DraggingInfo(object, source);
     replaySavedEvents();
+    if (draggingInfo) {
+        *performedEffect = draggingInfo->performedDropEffect();
+        delete draggingInfo;
+        draggingInfo = 0;
+    }
     return S_OK;
 }
 
@@ -561,6 +570,20 @@ HRESULT STDMETHODCALLTYPE UIDelegate::exceededDatabaseQuota(
         /* [in] */ IWebSecurityOrigin *origin,
         /* [in] */ BSTR databaseIdentifier)
 {
+    BSTR protocol;
+    BSTR host;
+    unsigned short port;
+
+    origin->protocol(&protocol);
+    origin->host(&host);
+    origin->port(&port);
+
+    if (!done && gLayoutTestController->dumpDatabaseCallbacks())
+        printf("UI DELEGATE DATABASE CALLBACK: exceededDatabaseQuotaForSecurityOrigin:{%S, %S, %i} database:%S\n", protocol, host, port, databaseIdentifier);
+
+    SysFreeString(protocol);
+    SysFreeString(host);
+
     static const unsigned long long defaultQuota = 5 * 1024 * 1024;
     origin->setQuota(defaultQuota);
 
@@ -604,3 +627,9 @@ HRESULT STDMETHODCALLTYPE UIDelegate::setStatusText(IWebView*, BSTR text)
         printf("UI DELEGATE STATUS CALLBACK: setStatusText:%S\n", text ? text : L"");
     return S_OK;
 }
+
+HRESULT STDMETHODCALLTYPE UIDelegate::desktopNotificationsDelegate(IWebDesktopNotificationsDelegate** result)
+{
+    m_desktopNotifications.copyRefTo(result);
+    return S_OK;
+}