[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 81555fb207c1e6530e587459bfb35daa6b37d4c5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 22:14:38 2009 +0000

    2009-12-17  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Disable memory cache client calls so that a new identifier isn't created
            for the same resource on reload.
    
            With the calls enabled, duplicate entries for cached resources are created
            in the Web Inspector. Safari for Windows disables the calls near the point of the
            Frame instance creation, and we just follow this for Chromium.
            https://bugs.webkit.org/show_bug.cgi?id=32618
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::WebViewImpl):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52291 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8609df6..d8ff663 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-17  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Disable memory cache client calls so that a new identifier isn't created
+        for the same resource on reload.
+
+        With the calls enabled, duplicate entries for cached resources are created
+        in the Web Inspector. Safari for Windows disables the calls near the point of the
+        Frame instance creation, and we just follow this for Chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=32618
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::WebViewImpl):
+
 2009-12-17  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 87a150a..6e83e8c 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -234,6 +234,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
 
     m_page->backForwardList()->setClient(&m_backForwardListClientImpl);
     m_page->setGroupName(pageGroupName);
+    m_page->setMemoryCacheClientCallsEnabled(false);
 }
 
 WebViewImpl::~WebViewImpl()

-- 
WebKit Debian packaging