Changeset 170113 in webkit for trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp

Timestamp:

Jun 18, 2014, 12:40:25 PM (11 years ago)

Author:

[email protected]

Message:

Adopt modern C++11 loops and fix WebArchive creation functions
​https://bugs.webkit.org/show_bug.cgi?id=134032

Reviewed by Andreas Kling.

Source/WebCore:
Use modern loops in a couple of places, fix DocumentLoader::subresources() to return a Vector,
and stop using Vectors of PassRefPtrs.

• WebCore.exp.in:
• dom/Document.cpp:

(WebCore::Document::textInserted):
(WebCore::Document::textRemoved):
(WebCore::Document::textNodesMerged):

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::subresources):
(WebCore::DocumentLoader::getSubresources): Deleted.

• loader/DocumentLoader.h:
• loader/appcache/ApplicationCache.cpp:

(WebCore::ApplicationCache::dump):

• loader/appcache/ApplicationCache.h:

(WebCore::ApplicationCache::resources):
(WebCore::ApplicationCache::begin): Deleted.
(WebCore::ApplicationCache::end): Deleted.

• loader/appcache/ApplicationCacheGroup.cpp:

(WebCore::ApplicationCacheGroup::didFinishLoadingManifest):

• loader/appcache/ApplicationCacheHost.cpp:

(WebCore::ApplicationCacheHost::fillResourceList):

• loader/appcache/ApplicationCacheStorage.cpp:

(WebCore::ApplicationCacheStorage::fallbackCacheGroupForURL):
(WebCore::ApplicationCacheStorage::store):
(WebCore::ApplicationCacheStorage::empty):
(WebCore::ApplicationCacheStorage::storeCopyOfCache):

• loader/archive/cf/LegacyWebArchive.cpp:

(WebCore::LegacyWebArchive::create):
(WebCore::LegacyWebArchive::createFromSelection):

• loader/archive/cf/LegacyWebArchive.h:
• xml/XMLHttpRequestProgressEventThrottle.cpp:

(WebCore::XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents):

Source/WebKit/mac:

• WebView/WebArchive.mm:

(-[WebArchive initWithMainResource:subresources:subframeArchives:]):

• WebView/WebDataSource.mm:

(-[WebDataSource subresources]):

Source/WebKit2:

• Shared/APIWebArchive.cpp:

(API::WebArchive::WebArchive):

File:

• trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (modified) (1 diff)

trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp

@@ -141 +141 @@
 
     // Take over the deferred events before dispatching them which can potentially add more.
-    Vector<RefPtr<Event>> deferredEvents;
-    m_deferredEvents.swap(deferredEvents);
+    auto deferredEvents = std::move(m_deferredEvents);
 
     RefPtr<Event> deferredProgressEvent = m_deferredProgressEvent;
-    m_deferredProgressEvent = 0;
-
-    Vector<RefPtr<Event>>::const_iterator it = deferredEvents.begin();
-    const Vector<RefPtr<Event>>::const_iterator end = deferredEvents.end();
-    for (; it != end; ++it)
-        dispatchEvent(*it);
+    m_deferredProgressEvent = nullptr;
+
+    for (auto& deferredEvent : deferredEvents)
+        dispatchEvent(deferredEvent.release());
 
     // The progress event will be in the m_deferredEvents vector if the load was finished while suspended.