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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bd3c1561dae3d9583b6db292422a520219bddc17
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 20:01:53 2010 +0000

    2010-09-10  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Remove useless FrameLoader method
            https://bugs.webkit.org/show_bug.cgi?id=45492
    
            This method has one caller, and that caller already has a more direct
            way of accessing the correct DocumentLoader.
    
            * loader/FrameLoader.cpp:
            * loader/FrameLoader.h:
            * loader/MainResourceLoader.cpp:
            (WebCore::MainResourceLoader::addData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67224 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 75c9cc7..feb3ab1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2010-09-10  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Darin Adler.
+
+        Remove useless FrameLoader method
+        https://bugs.webkit.org/show_bug.cgi?id=45492
+
+        This method has one caller, and that caller already has a more direct
+        way of accessing the correct DocumentLoader.
+
+        * loader/FrameLoader.cpp:
+        * loader/FrameLoader.h:
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::addData):
+
+2010-09-10  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         Main resource bytes shouldn't bounce through FrameLoader
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 3ea0863..fdc432d 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1493,11 +1493,6 @@ const ResourceRequest& FrameLoader::initialRequest() const
     return activeDocumentLoader()->originalRequest();
 }
 
-void FrameLoader::receivedData(const char* data, int length)
-{
-    activeDocumentLoader()->receivedData(data, length);
-}
-
 bool FrameLoader::willLoadMediaElementURL(KURL& url)
 {
     ResourceRequest request(url);
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index 336a357..9e8733d 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -153,7 +153,6 @@ public:
     const ResourceRequest& originalRequest() const;
     const ResourceRequest& initialRequest() const;
     void receivedMainResourceError(const ResourceError&, bool isComplete);
-    void receivedData(const char*, int);
 
     bool willLoadMediaElementURL(KURL&);
 
diff --git a/WebCore/loader/MainResourceLoader.cpp b/WebCore/loader/MainResourceLoader.cpp
index a7a5968..57ad950 100644
--- a/WebCore/loader/MainResourceLoader.cpp
+++ b/WebCore/loader/MainResourceLoader.cpp
@@ -146,7 +146,7 @@ bool MainResourceLoader::isPostOrRedirectAfterPost(const ResourceRequest& newReq
 void MainResourceLoader::addData(const char* data, int length, bool allAtOnce)
 {
     ResourceLoader::addData(data, length, allAtOnce);
-    frameLoader()->receivedData(data, length);
+    documentLoader()->receivedData(data, length);
 }
 
 void MainResourceLoader::willSendRequest(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)

-- 
WebKit Debian packaging