[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

beidson at apple.com beidson at apple.com
Thu Oct 29 20:44:41 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit eb71e54aa4853dee9d20a8f832a0ef1bf8a95cc9
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 19:32:37 2009 +0000

    WebKitTools: Don't set the history delegate on new windows that are opened during a test, as the history delegate:
    1 - Disables WebHistory
    2 - Doesn't make sense in that context anyway.
    
    Reviewed by Sam Weinig.
    
    * DumpRenderTree/win/DumpRenderTree.cpp:
    (createWebViewAndOffscreenWindow):
    
    LayoutTests: Un-skip a test that now passes.
    
    Reviewed by Sam Weinig.
    
    * platform/win/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ca908bd..fa6825d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-14  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Un-skip a test that now passes.
+
+        * platform/win/Skipped:
+
 2009-10-14  Nate Chapin  <japhet at chromium.org>
 
         Unreviewed, build fix.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 649d075..4e87fa1 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -684,7 +684,6 @@ fast/inline/relative-positioned-overflow.html
 plugins/private-browsing-mode.html
 
 # Skip these two failures I introduced this morning while I explore them.
-fast/history/window-open.html
 http/tests/globalhistory/history-delegate-basic-visited-links.html
 
 # Disable inspector tests while fixing them in release mode
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e337e75..57c2f2b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-14  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Don't set the history delegate on new windows that are opened during a test, as the history delegate:
+        1 - Disables WebHistory
+        2 - Doesn't make sense in that context anyway.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (createWebViewAndOffscreenWindow):
+
 2009-10-14  Kevin Ollivier  <kevino at theolliviers.com>
 
         wxMac build fix. Ensure 10.4 compatibility for deps, and allow the user to specify
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index f2b6220..76ddb2d 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -1104,9 +1104,6 @@ IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
     if (FAILED(webView->setResourceLoadDelegate(sharedResourceLoadDelegate.get())))
         return 0;
 
-    if (FAILED(viewPrivate->setHistoryDelegate(sharedHistoryDelegate.get())))
-        return 0;
-
     openWindows().append(hostWindow);
     windowToWebViewMap().set(hostWindow, webView);
     return webView;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list