[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e60850c3d3d8c2afcf913d38268fa9a5cf1c169c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 05:38:26 2010 +0000

    2010-02-17  Evan Martin  <evan at chromium.org>
    
            Reviewed by Eric Seidel.
    
            [chromium] expose cache-bypass flag in reload() API
            https://bugs.webkit.org/show_bug.cgi?id=34969
    
            This flag is used to force a reload to ignore caches.
            (Aka "shift-reload".)
    
            * public/WebFrame.h:
            * src/WebFrameImpl.cpp:
            (WebKit::WebFrameImpl::reload):
            * src/WebFrameImpl.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54928 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 586c492..d634d25 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-17  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [chromium] expose cache-bypass flag in reload() API
+        https://bugs.webkit.org/show_bug.cgi?id=34969
+
+        This flag is used to force a reload to ignore caches.
+        (Aka "shift-reload".)
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::reload):
+        * src/WebFrameImpl.h:
+
 2010-02-17  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h
index a56e6cb..f193b9e 100644
--- a/WebKit/chromium/public/WebFrame.h
+++ b/WebKit/chromium/public/WebFrame.h
@@ -241,7 +241,9 @@ public:
     // Navigation ----------------------------------------------------------
 
     // Reload the current document.
-    virtual void reload() = 0;
+    // True |ignoreCache| explicitly bypasses caches.
+    // False |ignoreCache| revalidates any existing cache entries.
+    virtual void reload(bool ignoreCache = false) = 0;
 
     // Load the given URL.
     virtual void loadRequest(const WebURLRequest&) = 0;
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 2f911f1..665f6a3 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -713,12 +713,13 @@ bool WebFrameImpl::insertStyleText(
     return success;
 }
 
-void WebFrameImpl::reload()
+void WebFrameImpl::reload(bool ignoreCache)
 {
     m_frame->loader()->history()->saveDocumentAndScrollState();
 
     stopLoading();  // Make sure existing activity stops.
-    m_frame->loader()->reload();
+
+    m_frame->loader()->reload(ignoreCache);
 }
 
 void WebFrameImpl::loadRequest(const WebURLRequest& request)
diff --git a/WebKit/chromium/src/WebFrameImpl.h b/WebKit/chromium/src/WebFrameImpl.h
index ccba6d4..4608e05 100644
--- a/WebKit/chromium/src/WebFrameImpl.h
+++ b/WebKit/chromium/src/WebFrameImpl.h
@@ -103,7 +103,7 @@ public:
     virtual v8::Local<v8::Context> mainWorldScriptContext() const;
 #endif
     virtual bool insertStyleText(const WebString& css, const WebString& id);
-    virtual void reload();
+    virtual void reload(bool ignoreCache);
     virtual void loadRequest(const WebURLRequest&);
     virtual void loadHistoryItem(const WebHistoryItem&);
     virtual void loadData(

-- 
WebKit Debian packaging