Merge 64293 - 2010-07-28 Justin Schuh <jschuh@chromium.org>...

WebCore/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 197 matching lines @@
 Page::~Page()
 {
     m_mainFrame->setView(0);
     setGroupName(String());
     allPages->remove(this);
     
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
         frame->pageDestroyed();
 
     m_editorClient->pageDestroyed();
+    if (m_pluginData)
+        m_pluginData->disconnectPage();
+    
 #if ENABLE(INSPECTOR)
     m_inspectorController->inspectedPageDestroyed();
 #endif
 
     backForwardList()->close();
 
 #ifndef NDEBUG
     pageCounter.decrement();
 
     // Cancel keepAlive timers, to ensure we release all Frames before exiting.
@@ skipping 615 matching lines @@
     ASSERT(m_frameCount >= 0);
 
     int frameCount = 0;
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
         ++frameCount;
 
     ASSERT(m_frameCount + 1 == frameCount);
 }
 #endif
 } // namespace WebCore