diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 14:33:32 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 12:24:51 +0100 |
| commit | 5af96e2c7b73ebc627c6894727826a7576d31758 (patch) | |
| tree | f9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebCore/page/Page.cpp | |
| parent | 8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff) | |
| download | external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2 | |
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebCore/page/Page.cpp')
| -rw-r--r-- | WebCore/page/Page.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
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<Page*>::iterator end = allPages->end(); for (HashSet<Page*>::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); } } |