OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All Rights Reserved. |
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 Page::~Page() | 185 Page::~Page() |
186 { | 186 { |
187 m_mainFrame->setView(0); | 187 m_mainFrame->setView(0); |
188 setGroupName(String()); | 188 setGroupName(String()); |
189 allPages->remove(this); | 189 allPages->remove(this); |
190 | 190 |
191 for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext(
)) | 191 for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext(
)) |
192 frame->pageDestroyed(); | 192 frame->pageDestroyed(); |
193 | 193 |
194 m_editorClient->pageDestroyed(); | 194 m_editorClient->pageDestroyed(); |
| 195 if (m_pluginData) |
| 196 m_pluginData->disconnectPage(); |
| 197 |
195 #if ENABLE(INSPECTOR) | 198 #if ENABLE(INSPECTOR) |
196 m_inspectorController->inspectedPageDestroyed(); | 199 m_inspectorController->inspectedPageDestroyed(); |
197 #endif | 200 #endif |
198 | 201 |
199 m_backForwardList->close(); | 202 m_backForwardList->close(); |
200 | 203 |
201 #ifndef NDEBUG | 204 #ifndef NDEBUG |
202 pageCounter.decrement(); | 205 pageCounter.decrement(); |
203 | 206 |
204 // Cancel keepAlive timers, to ensure we release all Frames before exiting. | 207 // Cancel keepAlive timers, to ensure we release all Frames before exiting. |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
825 ASSERT(m_frameCount >= 0); | 828 ASSERT(m_frameCount >= 0); |
826 | 829 |
827 int frameCount = 0; | 830 int frameCount = 0; |
828 for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext(
)) | 831 for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext(
)) |
829 ++frameCount; | 832 ++frameCount; |
830 | 833 |
831 ASSERT(m_frameCount + 1 == frameCount); | 834 ASSERT(m_frameCount + 1 == frameCount); |
832 } | 835 } |
833 #endif | 836 #endif |
834 } // namespace WebCore | 837 } // namespace WebCore |
OLD | NEW |