| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
| 3 * (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> | 3 * (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 | 282 |
| 283 ElementShadow* shadow = root->isElementNode() ? toElement(root)->shadow() :
0; | 283 ElementShadow* shadow = root->isElementNode() ? toElement(root)->shadow() :
0; |
| 284 if (shadow) | 284 if (shadow) |
| 285 collectFrameOwners(shadow); | 285 collectFrameOwners(shadow); |
| 286 } | 286 } |
| 287 | 287 |
| 288 inline void ChildFrameDisconnector::disconnectCollectedFrameOwners() | 288 inline void ChildFrameDisconnector::disconnectCollectedFrameOwners() |
| 289 { | 289 { |
| 290 // Must disable frame loading in the subtree so an unload handler cannot | 290 // Must disable frame loading in the subtree so an unload handler cannot |
| 291 // insert more frames and create loaded frames in detached subtrees. | 291 // insert more frames and create loaded frames in detached subtrees. |
| 292 SubframeLoadingDisabler disabler(m_root.raw()); | 292 SubframeLoadingDisabler disabler(m_root); |
| 293 | 293 |
| 294 for (unsigned i = 0; i < m_frameOwners->size(); ++i) { | 294 for (unsigned i = 0; i < m_frameOwners->size(); ++i) { |
| 295 Handle<HTMLFrameOwnerElement> owner = m_frameOwners->at(i); | 295 Handle<HTMLFrameOwnerElement> owner = m_frameOwners->at(i); |
| 296 // Don't need to traverse up the tree for the first owner since no | 296 // Don't need to traverse up the tree for the first owner since no |
| 297 // script could have moved it. | 297 // script could have moved it. |
| 298 if (!i || m_root->containsIncludingShadowDOM(owner)) | 298 if (!i || m_root->containsIncludingShadowDOM(owner)) |
| 299 owner->disconnectContentFrame(); | 299 owner->disconnectContentFrame(); |
| 300 } | 300 } |
| 301 } | 301 } |
| 302 | 302 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 317 collectFrameOwners(child); | 317 collectFrameOwners(child); |
| 318 } | 318 } |
| 319 } | 319 } |
| 320 | 320 |
| 321 disconnectCollectedFrameOwners(); | 321 disconnectCollectedFrameOwners(); |
| 322 } | 322 } |
| 323 | 323 |
| 324 } // namespace WebCore | 324 } // namespace WebCore |
| 325 | 325 |
| 326 #endif // ContainerNodeAlgorithms_h | 326 #endif // ContainerNodeAlgorithms_h |
| OLD | NEW |