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

[weinig at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 80053a5df275aa2fd80001fcc828220db2921891
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 22 20:06:10 2009 +0000

    Fix for <rdar://problem/6451745>
    Windows WebKit needs to implement reloadFromOrigin()
    
    Reviewed by Steve Falkenburg.
    
    * Interfaces/IWebFrame.idl:
    * Interfaces/IWebFramePrivate.idl:
    * Interfaces/IWebView.idl:
    * WebFrame.cpp:
    (WebFrame::reloadFromOrigin):
    * WebFrame.h:
    * WebView.cpp:
    (WebView::reloadFromOrigin):
    * WebView.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48645 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index aa43a89..0564996 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,20 @@
+2009-09-22  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Steve Falkenburg.
+
+        Fix for <rdar://problem/6451745>
+        Windows WebKit needs to implement reloadFromOrigin()
+
+        * Interfaces/IWebFrame.idl:
+        * Interfaces/IWebFramePrivate.idl:
+        * Interfaces/IWebView.idl:
+        * WebFrame.cpp:
+        (WebFrame::reloadFromOrigin):
+        * WebFrame.h:
+        * WebView.cpp:
+        (WebView::reloadFromOrigin):
+        * WebView.h:
+
 2009-09-22  Adam Roben  <aroben at apple.com>
 
         Manage refcounts correctly in DefaultDownloadDelegate::willSendRequest
diff --git a/WebKit/win/Interfaces/IWebFrame.idl b/WebKit/win/Interfaces/IWebFrame.idl
index 30af7b9..da2a78f 100644
--- a/WebKit/win/Interfaces/IWebFrame.idl
+++ b/WebKit/win/Interfaces/IWebFrame.idl
@@ -254,4 +254,10 @@ interface IWebFrame : IUnknown
         @param flag YES to mark the frame as not searchable
    */
    HRESULT setExcludeFromTextSearch([in] BOOL flag);
+
+   /*!
+       @method reloadFromOrigin
+       @discussion Performs HTTP/1.1 end-to-end reload.
+   */
+   HRESULT reloadFromOrigin();
 }
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index 96b42ab..954055d 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -91,4 +91,6 @@ interface IWebFramePrivate : IUnknown
     HRESULT numberOfActiveAnimations([out, retval] UINT* number);
 
     HRESULT isDisplayingStandaloneImage([out, retval] BOOL* result);
+
+    HRESULT reloadFromOrigin();
 }
diff --git a/WebKit/win/Interfaces/IWebView.idl b/WebKit/win/Interfaces/IWebView.idl
index c29edb9..bec4df5 100644
--- a/WebKit/win/Interfaces/IWebView.idl
+++ b/WebKit/win/Interfaces/IWebView.idl
@@ -873,6 +873,11 @@ interface IWebIBActions : IUnknown
         - (IBAction)resetPageZoom:(id)sender;
     */
     HRESULT resetPageZoom([in] IUnknown* sender);
+
+    /*
+        - (IBAction)reloadFromOrigin:(id)sender;
+    */
+    HRESULT reloadFromOrigin([in] IUnknown* sender);
 }
 
 /*
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index e50a830..cc3d5c4 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -304,6 +304,16 @@ HRESULT STDMETHODCALLTYPE WebFrame::setExcludeFromTextSearch(
     return E_FAIL;
 }
 
+HRESULT WebFrame::reloadFromOrigin()
+{
+    Frame* coreFrame = core(this);
+    if (!coreFrame)
+        return E_FAIL;
+
+    coreFrame->loader()->reload(true);
+    return S_OK;
+}
+
 HRESULT STDMETHODCALLTYPE WebFrame::paintDocumentRectToContext(
     /* [in] */ RECT rect,
     /* [in] */ OLE_HANDLE deviceContext)
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index 7af72d4..7de61ec 100644
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -224,6 +224,8 @@ public:
     virtual HRESULT STDMETHODCALLTYPE setExcludeFromTextSearch(
         /* [in] */ BOOL flag);
 
+    virtual HRESULT STDMETHODCALLTYPE reloadFromOrigin();
+
     virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContext(
         /* [in] */ RECT rect,
         /* [in] */ OLE_HANDLE deviceContext);
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 1bb7e47..8bb964c 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -3623,6 +3623,15 @@ HRESULT STDMETHODCALLTYPE WebView::toggleGrammarChecking(
     return setGrammarCheckingEnabled(enabled ? FALSE : TRUE);
 }
 
+HRESULT STDMETHODCALLTYPE WebView::reloadFromOrigin( 
+        /* [in] */ IUnknown* /*sender*/)
+{
+    if (!m_mainFrame)
+        return E_FAIL;
+
+    return m_mainFrame->reloadFromOrigin();
+}
+
 // IWebViewCSS -----------------------------------------------------------------
 
 HRESULT STDMETHODCALLTYPE WebView::computedStyleForElement( 
diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h
index 0f5c2a4..510e70a 100644
--- a/WebKit/win/WebView.h
+++ b/WebKit/win/WebView.h
@@ -353,6 +353,9 @@ public:
     virtual HRESULT STDMETHODCALLTYPE toggleGrammarChecking( 
         /* [in] */ IUnknown *sender);
 
+    virtual HRESULT STDMETHODCALLTYPE reloadFromOrigin( 
+        /* [in] */ IUnknown *sender);
+
     // IWebViewCSS
 
     virtual HRESULT STDMETHODCALLTYPE computedStyleForElement( 

-- 
WebKit Debian packaging