Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 static bool canLoadFrame(HTMLFrameOwnerElement& owner) | 133 static bool canLoadFrame(HTMLFrameOwnerElement& owner) |
| 134 { | 134 { |
| 135 for (Node* node = &owner; node; node = node->parentOrShadowHostNode()) { | 135 for (Node* node = &owner; node; node = node->parentOrShadowHostNode()) { |
| 136 if (disabledSubtreeRoots().contains(node)) | 136 if (disabledSubtreeRoots().contains(node)) |
| 137 return false; | 137 return false; |
| 138 } | 138 } |
| 139 return true; | 139 return true; |
| 140 } | 140 } |
| 141 | 141 |
| 142 private: | 142 private: |
| 143 CORE_EXPORT static HeapHashCountedSet<Member<Node>>& disabledSubtreeRoots(); | 143 using SubtreeRootSet = HeapHashCountedSet<Member<Node>>; |
|
sof
2016/06/07 08:28:00
unrelated, but too trivial to merit its own CL.
| |
| 144 | |
| 145 CORE_EXPORT static SubtreeRootSet& disabledSubtreeRoots(); | |
| 144 | 146 |
| 145 Member<Node> m_root; | 147 Member<Node> m_root; |
| 146 }; | 148 }; |
| 147 | 149 |
| 148 DEFINE_TYPE_CASTS(HTMLFrameOwnerElement, FrameOwner, owner, owner->isLocal(), ow ner.isLocal()); | 150 DEFINE_TYPE_CASTS(HTMLFrameOwnerElement, FrameOwner, owner, owner->isLocal(), ow ner.isLocal()); |
| 149 | 151 |
| 150 } // namespace blink | 152 } // namespace blink |
| 151 | 153 |
| 152 #endif // HTMLFrameOwnerElement_h | 154 #endif // HTMLFrameOwnerElement_h |
| OLD | NEW |