From 28040489d744e0c5d475a88663056c9040ed5320 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Wed, 10 Nov 2010 15:31:59 -0800
Subject: Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
---
 WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp')

diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 5138562..7c3d9b3 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -98,7 +98,6 @@ PolicyDelegate* policyDelegate;
 COMPtr<FrameLoadDelegate> sharedFrameLoadDelegate;
 COMPtr<UIDelegate> sharedUIDelegate;
 COMPtr<EditingDelegate> sharedEditingDelegate;
-COMPtr<ResourceLoadDelegate> sharedResourceLoadDelegate;
 COMPtr<HistoryDelegate> sharedHistoryDelegate;
 
 IWebFrame* frame;
@@ -1201,7 +1200,10 @@ IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
     if (FAILED(viewEditing->setEditingDelegate(sharedEditingDelegate.get())))
         return 0;
 
-    if (FAILED(webView->setResourceLoadDelegate(sharedResourceLoadDelegate.get())))
+    ResourceLoadDelegate* resourceLoadDelegate = new ResourceLoadDelegate();
+    HRESULT result = webView->setResourceLoadDelegate(resourceLoadDelegate);
+    resourceLoadDelegate->Release(); // The delegate is owned by the WebView, so release our reference to it.
+    if (FAILED(result))
         return 0;
 
     openWindows().append(hostWindow);
@@ -1285,7 +1287,6 @@ int main(int argc, char* argv[])
     sharedFrameLoadDelegate.adoptRef(new FrameLoadDelegate);
     sharedUIDelegate.adoptRef(new UIDelegate);
     sharedEditingDelegate.adoptRef(new EditingDelegate);
-    sharedResourceLoadDelegate.adoptRef(new ResourceLoadDelegate);
     sharedHistoryDelegate.adoptRef(new HistoryDelegate);
 
     // FIXME - need to make DRT pass with Windows native controls <http://bugs.webkit.org/show_bug.cgi?id=25592>
-- 
cgit v1.1