OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/dom/ChildFrameDisconnector.h" | 5 #include "core/dom/ChildFrameDisconnector.h" |
6 | 6 |
7 #include "core/dom/shadow/ElementShadow.h" | 7 #include "core/dom/shadow/ElementShadow.h" |
8 #include "core/dom/shadow/ShadowRoot.h" | 8 #include "core/dom/shadow/ShadowRoot.h" |
9 #include "core/html/HTMLFrameOwnerElement.h" | 9 #include "core/html/HTMLFrameOwnerElement.h" |
10 #include "wtf/Assertions.h" | 10 #include "wtf/Assertions.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 void ChildFrameDisconnector::disconnectCollectedFrameOwners() | 53 void ChildFrameDisconnector::disconnectCollectedFrameOwners() |
54 { | 54 { |
55 // Must disable frame loading in the subtree so an unload handler cannot | 55 // Must disable frame loading in the subtree so an unload handler cannot |
56 // insert more frames and create loaded frames in detached subtrees. | 56 // insert more frames and create loaded frames in detached subtrees. |
57 SubframeLoadingDisabler disabler(root()); | 57 SubframeLoadingDisabler disabler(root()); |
58 | 58 |
59 for (unsigned i = 0; i < m_frameOwners.size(); ++i) { | 59 for (unsigned i = 0; i < m_frameOwners.size(); ++i) { |
60 HTMLFrameOwnerElement* owner = m_frameOwners[i].get(); | 60 HTMLFrameOwnerElement* owner = m_frameOwners[i].get(); |
61 // Don't need to traverse up the tree for the first owner since no | 61 // Don't need to traverse up the tree for the first owner since no |
62 // script could have moved it. | 62 // script could have moved it. |
63 if (!i || root().containsIncludingShadowDOM(owner)) | 63 if (!i || root().isShadowIncludingInclusiveAncestorOf(owner)) |
64 owner->disconnectContentFrame(); | 64 owner->disconnectContentFrame(); |
65 } | 65 } |
66 } | 66 } |
67 | 67 |
68 void ChildFrameDisconnector::collectFrameOwners(ElementShadow& shadow) | 68 void ChildFrameDisconnector::collectFrameOwners(ElementShadow& shadow) |
69 { | 69 { |
70 for (ShadowRoot* root = &shadow.youngestShadowRoot(); root; root = root->old
erShadowRoot()) | 70 for (ShadowRoot* root = &shadow.youngestShadowRoot(); root; root = root->old
erShadowRoot()) |
71 collectFrameOwners(*root); | 71 collectFrameOwners(*root); |
72 } | 72 } |
73 | 73 |
(...skipping 22 matching lines...) Expand all Loading... |
96 // If we overcount it's safe, but not optimal because it means we'll travers
e | 96 // If we overcount it's safe, but not optimal because it means we'll travers
e |
97 // through the document in ChildFrameDisconnector looking for frames that ha
ve | 97 // through the document in ChildFrameDisconnector looking for frames that ha
ve |
98 // already been disconnected. | 98 // already been disconnected. |
99 ASSERT(node.connectedSubframeCount() == count); | 99 ASSERT(node.connectedSubframeCount() == count); |
100 | 100 |
101 return count; | 101 return count; |
102 } | 102 } |
103 #endif | 103 #endif |
104 | 104 |
105 } // namespace blink | 105 } // namespace blink |
OLD | NEW |