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 22 matching lines...) Expand all Loading... |
33 #include "core/loader/FrameLoadRequest.h" | 33 #include "core/loader/FrameLoadRequest.h" |
34 #include "core/loader/FrameLoader.h" | 34 #include "core/loader/FrameLoader.h" |
35 #include "core/loader/FrameLoaderClient.h" | 35 #include "core/loader/FrameLoaderClient.h" |
36 #include "core/plugins/PluginView.h" | 36 #include "core/plugins/PluginView.h" |
37 #include "platform/weborigin/SecurityOrigin.h" | 37 #include "platform/weborigin/SecurityOrigin.h" |
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 ALLOW_UNSAFE_SINGLETON() |
43 DEFINE_STATIC_LOCAL(WidgetToParentMap, map, (new WidgetToParentMap)); | 44 DEFINE_STATIC_LOCAL(WidgetToParentMap, map, (new WidgetToParentMap)); |
44 return map; | 45 return map; |
45 } | 46 } |
46 | 47 |
47 using WidgetSet = HeapHashSet<Member<Widget>>; | 48 using WidgetSet = HeapHashSet<Member<Widget>>; |
48 static WidgetSet& widgetsPendingTemporaryRemovalFromParent() { | 49 static WidgetSet& widgetsPendingTemporaryRemovalFromParent() { |
49 // Widgets in this set will not leak because it will be cleared in | 50 // Widgets in this set will not leak because it will be cleared in |
50 // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOperati
ons. | 51 // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOperati
ons. |
51 DEFINE_STATIC_LOCAL(WidgetSet, set, (new WidgetSet)); | 52 DEFINE_STATIC_LOCAL(WidgetSet, set, (new WidgetSet)); |
52 return set; | 53 return set; |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 } | 323 } |
323 | 324 |
324 DEFINE_TRACE(HTMLFrameOwnerElement) { | 325 DEFINE_TRACE(HTMLFrameOwnerElement) { |
325 visitor->trace(m_contentFrame); | 326 visitor->trace(m_contentFrame); |
326 visitor->trace(m_widget); | 327 visitor->trace(m_widget); |
327 HTMLElement::trace(visitor); | 328 HTMLElement::trace(visitor); |
328 FrameOwner::trace(visitor); | 329 FrameOwner::trace(visitor); |
329 } | 330 } |
330 | 331 |
331 } // namespace blink | 332 } // namespace blink |
OLD | NEW |