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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b8155779f159542140f215f026ed3cb82d29d263
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 20:45:48 2010 +0000

    2010-09-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Remove (has|set)ReceivedResponse() from public ResourceHandleWin API
            https://bugs.webkit.org/show_bug.cgi?id=46391
    
            There is no need for this functions to be public, so remove them.
    
            * platform/network/ResourceHandle.h:
            * platform/network/win/ResourceHandleWin.cpp:
            (WebCore::ResourceHandle::onRequestComplete):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7ce55d9..150e6fd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Remove (has|set)ReceivedResponse() from public ResourceHandleWin API
+        https://bugs.webkit.org/show_bug.cgi?id=46391
+
+        There is no need for this functions to be public, so remove them.
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::onRequestComplete):
+
 2010-09-23  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h
index 6361a7a..d6c7ceb 100644
--- a/WebCore/platform/network/ResourceHandle.h
+++ b/WebCore/platform/network/ResourceHandle.h
@@ -168,8 +168,6 @@ public:
     static void forceContentSniffing();
 
 #if USE(WININET)
-    void setHasReceivedResponse(bool = true);
-    bool hasReceivedResponse() const;
     void fileLoadTimer(Timer<ResourceHandle>*);
     void onHandleCreated(LPARAM);
     void onRedirect();
diff --git a/WebCore/platform/network/win/ResourceHandleWin.cpp b/WebCore/platform/network/win/ResourceHandleWin.cpp
index 5384006..fc74471 100644
--- a/WebCore/platform/network/win/ResourceHandleWin.cpp
+++ b/WebCore/platform/network/win/ResourceHandleWin.cpp
@@ -357,8 +357,9 @@ bool ResourceHandle::onRequestComplete()
 
     BOOL ok = FALSE;
     while ((ok = InternetReadFileExA(d->m_requestHandle, &buffers, d->m_loadSynchronously ? 0 : IRF_NO_WAIT, reinterpret_cast<DWORD_PTR>(this))) && buffers.dwBufferLength) {
-        if (!hasReceivedResponse()) {
-            setHasReceivedResponse();
+        if (!d->m_hasReceivedResponse) {
+            d->m_hasReceivedResponse = true;
+
             ResourceResponse response;
             response.setURL(firstRequest().url());
 
@@ -600,16 +601,6 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
     handle.start(context);
 }
 
-void ResourceHandle::setHasReceivedResponse(bool b)
-{
-    d->m_hasReceivedResponse = b;
-}
-
-bool ResourceHandle::hasReceivedResponse() const
-{
-    return d->m_hasReceivedResponse;
-}
-
 bool ResourceHandle::willLoadFromCache(ResourceRequest&, Frame*)
 {
     notImplemented();

-- 
WebKit Debian packaging