From 5af96e2c7b73ebc627c6894727826a7576d31758 Mon Sep 17 00:00:00 2001 From: Leon Clarke Date: Thu, 3 Jun 2010 14:33:32 +0100 Subject: Merge webkit.org at r60469 : Initial merge by git. Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234 --- WebCore/page/Page.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'WebCore/page/Page.cpp') diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp index ae7c9ad..446f9f0 100644 --- a/WebCore/page/Page.cpp +++ b/WebCore/page/Page.cpp @@ -395,13 +395,17 @@ void Page::refreshPlugins(bool reload) HashSet::iterator end = allPages->end(); for (HashSet::iterator it = allPages->begin(); it != end; ++it) { - (*it)->m_pluginData = 0; + Page* page = *it; + + // Clear out the page's plug-in data. + page->m_pluginData = 0; - if (reload) { - for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) { - if (frame->loader()->containsPlugins()) - framesNeedingReload.append(frame); - } + if (!reload) + continue; + + for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) { + if (frame->loader()->containsPlugins()) + framesNeedingReload.append(frame); } } -- cgit v1.1