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 27 matching lines...) Expand all Loading... |
38 | 38 |
39 namespace blink { | 39 namespace blink { |
40 | 40 |
41 typedef HeapHashMap<Member<Widget>, Member<FrameView>> WidgetToParentMap; | 41 typedef HeapHashMap<Member<Widget>, Member<FrameView>> WidgetToParentMap; |
42 static WidgetToParentMap& widgetNewParentMap() | 42 static WidgetToParentMap& widgetNewParentMap() |
43 { | 43 { |
44 DEFINE_STATIC_LOCAL(WidgetToParentMap, map, (new WidgetToParentMap)); | 44 DEFINE_STATIC_LOCAL(WidgetToParentMap, map, (new WidgetToParentMap)); |
45 return map; | 45 return map; |
46 } | 46 } |
47 | 47 |
48 typedef HeapHashSet<Member<Widget>> WidgetSet; | 48 using WidgetSet = HeapHashSet<Member<Widget>>; |
49 static WidgetSet& widgetsPendingTemporaryRemovalFromParent() | 49 static WidgetSet& widgetsPendingTemporaryRemovalFromParent() |
50 { | 50 { |
51 // Widgets in this set will not leak because it will be cleared in | 51 // Widgets in this set will not leak because it will be cleared in |
52 // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOpera
tions. | 52 // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOpera
tions. |
53 DEFINE_STATIC_LOCAL(WidgetSet, set, (new WidgetSet)); | 53 DEFINE_STATIC_LOCAL(WidgetSet, set, (new WidgetSet)); |
54 return set; | 54 return set; |
55 } | 55 } |
56 | 56 |
57 HeapHashCountedSet<Member<Node>>& SubframeLoadingDisabler::disabledSubtreeRoots(
) | 57 SubframeLoadingDisabler::SubtreeRootSet& SubframeLoadingDisabler::disabledSubtre
eRoots() |
58 { | 58 { |
59 DEFINE_STATIC_LOCAL(HeapHashCountedSet<Member<Node>>, nodes, (new HeapHashCo
untedSet<Member<Node>>)); | 59 DEFINE_STATIC_LOCAL(SubtreeRootSet, nodes, (new SubtreeRootSet)); |
60 return nodes; | 60 return nodes; |
61 } | 61 } |
62 | 62 |
63 static unsigned s_updateSuspendCount = 0; | 63 static unsigned s_updateSuspendCount = 0; |
64 | 64 |
65 HTMLFrameOwnerElement::UpdateSuspendScope::UpdateSuspendScope() | 65 HTMLFrameOwnerElement::UpdateSuspendScope::UpdateSuspendScope() |
66 { | 66 { |
67 ++s_updateSuspendCount; | 67 ++s_updateSuspendCount; |
68 } | 68 } |
69 | 69 |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 DEFINE_TRACE(HTMLFrameOwnerElement) | 303 DEFINE_TRACE(HTMLFrameOwnerElement) |
304 { | 304 { |
305 visitor->trace(m_contentFrame); | 305 visitor->trace(m_contentFrame); |
306 visitor->trace(m_widget); | 306 visitor->trace(m_widget); |
307 HTMLElement::trace(visitor); | 307 HTMLElement::trace(visitor); |
308 FrameOwner::trace(visitor); | 308 FrameOwner::trace(visitor); |
309 } | 309 } |
310 | 310 |
311 | 311 |
312 } // namespace blink | 312 } // namespace blink |
OLD | NEW |