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

[joepeck at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0dcc2dce252942f64eb521d15147615d8ff9984b
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 21:22:42 2010 +0000

    2010-12-02  Joseph Pecoraro  <joepeck at webkit.org>
    
            Reviewed by Darin Adler.
    
            Update ResourceLoaderSet Enumeration
            https://bugs.webkit.org/show_bug.cgi?id=50405
    
            * loader/DocumentLoader.cpp:
            (WebCore::cancelAll): instead of copying the HashSet, use copyToVector.
            (WebCore::setAllDefersLoading): instead of copying the HashSet, use copyToVector.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 138f7f4..ab68a1f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-02  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Update ResourceLoaderSet Enumeration
+        https://bugs.webkit.org/show_bug.cgi?id=50405
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::cancelAll): instead of copying the HashSet, use copyToVector.
+        (WebCore::setAllDefersLoading): instead of copying the HashSet, use copyToVector.
+
 2010-12-02  Andy Estes  <aestes at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp
index cc46113..dc87542 100644
--- a/WebCore/loader/DocumentLoader.cpp
+++ b/WebCore/loader/DocumentLoader.cpp
@@ -58,18 +58,20 @@ namespace WebCore {
 
 static void cancelAll(const ResourceLoaderSet& loaders)
 {
-    const ResourceLoaderSet copy = loaders;
-    ResourceLoaderSet::const_iterator end = copy.end();
-    for (ResourceLoaderSet::const_iterator it = copy.begin(); it != end; ++it)
-        (*it)->cancel();
+    Vector<RefPtr<ResourceLoader> > loadersCopy;
+    copyToVector(loaders, loadersCopy);
+    size_t size = loadersCopy.size();
+    for (unsigned i = 0; i < size; ++i)
+        loadersCopy[i]->cancel();
 }
 
 static void setAllDefersLoading(const ResourceLoaderSet& loaders, bool defers)
 {
-    const ResourceLoaderSet copy = loaders;
-    ResourceLoaderSet::const_iterator end = copy.end();
-    for (ResourceLoaderSet::const_iterator it = copy.begin(); it != end; ++it)
-        (*it)->setDefersLoading(defers);
+    Vector<RefPtr<ResourceLoader> > loadersCopy;
+    copyToVector(loaders, loadersCopy);
+    size_t size = loadersCopy.size();
+    for (unsigned i = 0; i < size; ++i)
+        loadersCopy[i]->setDefersLoading(defers);
 }
 
 DocumentLoader::DocumentLoader(const ResourceRequest& req, const SubstituteData& substituteData)

-- 
WebKit Debian packaging