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

[japhet at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f00dffa6c626579358d3fd1f14729bb6807814d7
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 07:46:22 2010 +0000

    2010-07-16  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Regression in r63100: Don't clear m_loadType in
            FrameLoader::handledOnloadEvents, as it is used
            to make some decisions after the load has actually
            completed.
    
            Tickling this bug requires manipulation
            via the API (layout tests don't appear to traverse
            the correct codepath), so no layout test.
    
            https://bugs.webkit.org/show_bug.cgi?id=42298
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::handledOnloadEvents): Don't reset m_loadType.
            (WebCore::FrameLoader::addExtraFieldsToRequest): Set subresource cache
               policy in one place and don't depend on m_loadType.
    2010-07-16  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Uncomment an assert that broke due to r63100.
    
            https://bugs.webkit.org/show_bug.cgi?id=42298
    
            * tests/testwebview.c:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 01eb076..e9e3e70 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-16  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Regression in r63100: Don't clear m_loadType in
+        FrameLoader::handledOnloadEvents, as it is used
+        to make some decisions after the load has actually
+        completed.
+
+        Tickling this bug requires manipulation
+        via the API (layout tests don't appear to traverse
+        the correct codepath), so no layout test.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42298
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::handledOnloadEvents): Don't reset m_loadType.
+        (WebCore::FrameLoader::addExtraFieldsToRequest): Set subresource cache
+           policy in one place and don't depend on m_loadType.
+
 2010-07-15  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index d8aca14..51a0695 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2609,8 +2609,6 @@ void FrameLoader::handledOnloadEvents()
 {
     m_client->dispatchDidHandleOnloadEvents();
 
-    m_loadType = FrameLoadTypeStandard;
-
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (documentLoader())
         documentLoader()->applicationCacheHost()->stopDeferringEvents();
@@ -2690,7 +2688,14 @@ void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadTyp
     // 2. Delegates that modify the cache policy using willSendRequest: should
     //    not affect any other resources. Such changes need to be done
     //    per request.
-    if (loadType == FrameLoadTypeReload) {
+    if (!mainResource) {
+        if (request.isConditional())
+            request.setCachePolicy(ReloadIgnoringCacheData);
+        else if (documentLoader()->isLoadingInAPISense())
+            request.setCachePolicy(documentLoader()->originalRequest().cachePolicy());
+        else
+            request.setCachePolicy(UseProtocolCachePolicy);
+    } else if (loadType == FrameLoadTypeReload) {
         request.setCachePolicy(ReloadIgnoringCacheData);
         request.setHTTPHeaderField("Cache-Control", "max-age=0");
     } else if (loadType == FrameLoadTypeReloadFromOrigin) {
@@ -2701,8 +2706,6 @@ void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadTyp
         request.setCachePolicy(ReloadIgnoringCacheData);
     else if (isBackForwardLoadType(loadType) && m_stateMachine.committedFirstRealDocumentLoad() && !request.url().protocolIs("https"))
         request.setCachePolicy(ReturnCacheDataElseLoad);
-    else if (!mainResource && documentLoader()->isLoadingInAPISense())
-        request.setCachePolicy(documentLoader()->originalRequest().cachePolicy());
     
     if (mainResource)
         request.setHTTPAccept(defaultAcceptHeader);
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a1c1e5a..19ab240 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-16  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Uncomment an assert that broke due to r63100.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42298
+
+        * tests/testwebview.c:
+
 2010-07-14  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/gtk/tests/testwebview.c b/WebKit/gtk/tests/testwebview.c
index 0bea643..36511d7 100644
--- a/WebKit/gtk/tests/testwebview.c
+++ b/WebKit/gtk/tests/testwebview.c
@@ -266,10 +266,7 @@ static void do_test_webkit_web_view_adjustments(gboolean with_page_cache)
     g_assert_cmpfloat(lower, ==, gtk_adjustment_get_lower(adjustment));
     g_assert_cmpfloat(upper, ==, gtk_adjustment_get_upper(adjustment));
 
-    // This assert is temporarily disabled until we fix the following bug:
-    // https://bugs.webkit.org/show_bug.cgi?id=42114
-    // It should be re-enabled ASAP.
-    // g_assert_cmpfloat(gtk_adjustment_get_value(adjustment), ==, 100.0);
+    g_assert_cmpfloat(gtk_adjustment_get_value(adjustment), ==, 100.0);
 
     g_free(effective_uri);
     g_free(second_uri);

-- 
WebKit Debian packaging