← Back to branch summary

~jconti/ubuntu/oneiric/webkit/fix_doc_path

« back to all changes in this revision

Viewing changes to WebCore/page/Page.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-10-18 20:17:09 UTC
  • mfrom: (1.5.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20101018201709-dkathefl8vvl2uxe
Tags: 1.2.5-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/page/Page.cpp
192
192
        frame->pageDestroyed();
193
193
 
194
194
    m_editorClient->pageDestroyed();
 
195
    if (m_pluginData)
 
196
        m_pluginData->disconnectPage();
 
197
    
195
198
#if ENABLE(INSPECTOR)
196
199
    m_inspectorController->inspectedPageDestroyed();
197
200
#endif
370
373
 
371
374
    HashSet<Page*>::iterator end = allPages->end();
372
375
    for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it) {
373
 
        (*it)->m_pluginData = 0;
374
 
 
375
 
        if (reload) {
376
 
            for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
377
 
                if (frame->loader()->containsPlugins())
378
 
                    framesNeedingReload.append(frame);
379
 
            }
 
376
        Page* page = *it;
 
377
        
 
378
        // Clear out the page's plug-in data.
 
379
        if (page->m_pluginData) {
 
380
            page->m_pluginData->disconnectPage();
 
381
            page->m_pluginData = 0;
 
382
        }
 
383
 
 
384
        if (!reload)
 
385
            continue;
 
386
 
 
387
        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
 
388
            if (frame->loader()->containsPlugins())
 
389
                framesNeedingReload.append(frame);
380
390
        }
381
391
    }
382
392