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

abarth at webkit.org abarth at webkit.org
Wed Dec 22 14:07:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4a3c18db2a97fa3317164ccd35854b75dd27f063
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 4 22:19:35 2010 +0000

    2010-10-04  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            ResourceHandle's public/protected/private sections are fragmented
            https://bugs.webkit.org/show_bug.cgi?id=47038
    
            Minor cleanup.
    
            * platform/network/ResourceHandle.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69042 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1cb915d..5bd6ea3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-04  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        ResourceHandle's public/protected/private sections are fragmented
+        https://bugs.webkit.org/show_bug.cgi?id=47038
+
+        Minor cleanup.
+
+        * platform/network/ResourceHandle.h:
+
 2010-10-04  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h
index 65033bd..d518d87 100644
--- a/WebCore/platform/network/ResourceHandle.h
+++ b/WebCore/platform/network/ResourceHandle.h
@@ -94,16 +94,6 @@ class ResourceHandle : public RefCounted<ResourceHandle>
     , public AuthenticationClient
 #endif
     {
-protected:
-    ResourceHandle(const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
-
-private:
-    enum FailureType {
-        NoFailure,
-        BlockedFailure,
-        InvalidURLFailure
-    };
-
 public:
     static PassRefPtr<ResourceHandle> create(NetworkingContext*, const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
     static void loadResourceSynchronously(NetworkingContext*, const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
@@ -199,7 +189,16 @@ public:
     using RefCounted<ResourceHandle>::ref;
     using RefCounted<ResourceHandle>::deref;
 
+protected:
+    ResourceHandle(const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
+
 private:
+    enum FailureType {
+        NoFailure,
+        BlockedFailure,
+        InvalidURLFailure
+    };
+
     void platformSetDefersLoading(bool);
 
     void scheduleFailure(FailureType);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list