[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

aroben at apple.com aroben at apple.com
Wed Dec 22 16:06:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 9a268f1936a44ab3ba828633bcc0952cab5659fd
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 18:48:01 2010 +0000

    Implement layoutTestController.waitForPolicyDelegate on Windows
    
    Fixes <http://webkit.org/b/25038> <rdar://problem/6790213>.
    
    Reviewed by Simon Fraser.
    
    LayoutTests:
    
    Unskip tests that rely on layoutTestController.waitForPolicyDelegate on
    Windows
    
    * platform/win/Skipped:
    
    WebKitTools:
    
    * DumpRenderTree/win/LayoutTestControllerWin.cpp:
    (LayoutTestController::waitForPolicyDelegate): Implemented by porting
    code from LayoutTestControllerMac.mm.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8a77a7a..c71dfa7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-18  Adam Roben  <aroben at apple.com>
+
+        Unskip tests that rely on layoutTestController.waitForPolicyDelegate on
+        Windows
+
+        Fixes <http://webkit.org/b/25038> <rdar://problem/6790213>.
+
+        Reviewed by Simon Fraser.
+
+        * platform/win/Skipped:
+
 2010-11-18  Anton Muhin  <antonm at chromium.org>
 
         Not reviewed, rebaselining fast/parser/style-script-head-test.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 3973f33..02a1b9c 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -633,26 +633,6 @@ plugins/npruntime/npruntime.html
 ######################### End list of r41995 failures ##########################
 ################################################################################
 
-# Bug 25038: [Windows] Implement layoutTestController.waitForPolicyDelegate <https://bugs.webkit.org/show_bug.cgi?id=25038>
-fast/encoding/mailto-always-utf-8.html
-fast/forms/mailto/advanced-get.html
-fast/forms/mailto/advanced-put.html
-fast/forms/mailto/get-multiple-items-text-plain.html
-fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html
-fast/forms/mailto/get-multiple-items.html
-fast/forms/mailto/get-non-ascii-always-utf-8.html
-fast/forms/mailto/get-non-ascii-text-plain-latin-1.html
-fast/forms/mailto/get-non-ascii-text-plain.html
-fast/forms/mailto/get-non-ascii.html
-fast/forms/mailto/get-overwrite-query.html
-fast/forms/mailto/post-append-query.html
-fast/forms/mailto/post-multiple-items-multipart-form-data.html
-fast/forms/mailto/post-multiple-items-text-plain.html
-fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html
-fast/forms/mailto/post-multiple-items.html
-fast/forms/mailto/post-text-plain-with-accept-charset.html
-fast/forms/mailto/post-text-plain.html
-
 # <rdar://6772112> Cookies expire 1 hour too early
 fast/cookies/local-file-can-set-cookies.html
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c17bea2..d111e7d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-18  Adam Roben  <aroben at apple.com>
+
+        Implement layoutTestController.waitForPolicyDelegate on Windows
+
+        Fixes <http://webkit.org/b/25038> <rdar://problem/6790213>.
+
+        Reviewed by Simon Fraser.
+
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::waitForPolicyDelegate): Implemented by porting
+        code from LayoutTestControllerMac.mm.
+
 2010-11-18  Hayato Ito  <hayato at chromium.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index 386f118..0043ce6 100644
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -229,7 +229,13 @@ JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSContextRe
 
 void LayoutTestController::waitForPolicyDelegate()
 {
-    // FIXME: Implement this.
+    COMPtr<IWebView> webView;
+    if (FAILED(frame->webView(&webView)))
+        return;
+
+    setWaitToDump(true);
+    policyDelegate->setControllerToNotifyDone(this);
+    webView->setPolicyDelegate(policyDelegate);
 }
 
 size_t LayoutTestController::webHistoryItemCount()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list