From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/page/PageGroupLoadDeferrer.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'Source/WebCore/page/PageGroupLoadDeferrer.cpp') diff --git a/Source/WebCore/page/PageGroupLoadDeferrer.cpp b/Source/WebCore/page/PageGroupLoadDeferrer.cpp index b5f1ca341..ed69c876d 100644 --- a/Source/WebCore/page/PageGroupLoadDeferrer.cpp +++ b/Source/WebCore/page/PageGroupLoadDeferrer.cpp @@ -27,17 +27,12 @@ #include "Page.h" #include "PageGroup.h" #include "ScriptRunner.h" -#include namespace WebCore { PageGroupLoadDeferrer::PageGroupLoadDeferrer(Page& page, bool deferSelf) { - const HashSet& pages = page.group().pages(); - - HashSet::const_iterator end = pages.end(); - for (HashSet::const_iterator it = pages.begin(); it != end; ++it) { - Page* otherPage = *it; + for (auto& otherPage : page.group().pages()) { if ((deferSelf || otherPage != &page)) { if (!otherPage->defersLoading()) { m_deferredFrames.append(&otherPage->mainFrame()); @@ -50,16 +45,16 @@ PageGroupLoadDeferrer::PageGroupLoadDeferrer(Page& page, bool deferSelf) } } - size_t count = m_deferredFrames.size(); - for (size_t i = 0; i < count; ++i) - if (Page* page = m_deferredFrames[i]->page()) + for (auto& deferredFrame : m_deferredFrames) { + if (Page* page = deferredFrame->page()) page->setDefersLoading(true); + } } PageGroupLoadDeferrer::~PageGroupLoadDeferrer() { - for (size_t i = 0; i < m_deferredFrames.size(); ++i) { - if (Page* page = m_deferredFrames[i]->page()) { + for (auto& deferredFrame : m_deferredFrames) { + if (Page* page = deferredFrame->page()) { page->setDefersLoading(false); for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) -- cgit v1.2.1