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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4ad9c184b351cc82815a43d06c6e840b5c96921c
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 00:46:44 2010 +0000

    2010-11-09  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            [Chromium] http/tests/security/XFrameOptions fail with Chromium DRT
            https://bugs.webkit.org/show_bug.cgi?id=49286
    
            The tests in http/tests/security/XFrameOptions started to fail after
            r71297, since it changed the WebViewHost::assignIdentifierToRequest
            logic to always assign identifiers to requests, even if we're not going
            to be dumping resource load callbacks at that point. These tests
            only call LayoutTestController.dumpResourceLoadCallbacks after the
            request is started, thus their expectations have "<unknown>" as the
            identifier. Change WebViewHost to the previous behavior, which also
            match the other ports'.
    
            * DumpRenderTree/chromium/WebViewHost.cpp:
            (WebViewHost::assignIdentifierToRequest):
            (WebViewHost::removeIdentifierForRequest):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71699 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 064ea0b..81ce5fa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-09  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [Chromium] http/tests/security/XFrameOptions fail with Chromium DRT
+        https://bugs.webkit.org/show_bug.cgi?id=49286
+        
+        The tests in http/tests/security/XFrameOptions started to fail after
+        r71297, since it changed the WebViewHost::assignIdentifierToRequest
+        logic to always assign identifiers to requests, even if we're not going
+        to be dumping resource load callbacks at that point. These tests
+        only call LayoutTestController.dumpResourceLoadCallbacks after the
+        request is started, thus their expectations have "<unknown>" as the
+        identifier. Change WebViewHost to the previous behavior, which also
+        match the other ports'.
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::assignIdentifierToRequest):
+        (WebViewHost::removeIdentifierForRequest):
+
 2010-11-08  Tony Chang  <tony at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
index 0dc57ef..6c0bd7d 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -940,13 +940,14 @@ void WebViewHost::didChangeLocationWithinPage(WebFrame* frame)
 
 void WebViewHost::assignIdentifierToRequest(WebFrame*, unsigned identifier, const WebURLRequest& request)
 {
+     if (!m_shell->shouldDumpResourceLoadCallbacks())
+        return;
     ASSERT(!m_resourceIdentifierMap.contains(identifier));
     m_resourceIdentifierMap.set(identifier, descriptionSuitableForTestResult(request.url().spec()));
 }
 
 void WebViewHost::removeIdentifierForRequest(unsigned identifier)
 {
-    ASSERT(m_resourceIdentifierMap.contains(identifier));
     m_resourceIdentifierMap.remove(identifier);
 }
 

-- 
WebKit Debian packaging