| 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 24 matching lines...) Expand all Loading... |
| 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/RuntimeEnabledFeatures.h" | 37 #include "platform/RuntimeEnabledFeatures.h" |
| 38 #include "platform/weborigin/SecurityOrigin.h" | 38 #include "platform/weborigin/SecurityOrigin.h" |
| 39 | 39 |
| 40 namespace blink { | 40 namespace blink { |
| 41 | 41 |
| 42 typedef WillBeHeapHashMap<RefPtrWillBeMember<Widget>, RawPtrWillBeMember<FrameVi
ew>> WidgetToParentMap; | 42 typedef WillBeHeapHashMap<RefPtrWillBeMember<Widget>, RawPtrWillBeMember<FrameVi
ew>> WidgetToParentMap; |
| 43 static WidgetToParentMap& widgetNewParentMap() | 43 static WidgetToParentMap& widgetNewParentMap() |
| 44 { | 44 { |
| 45 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WidgetToParentMap>, map, (adoptPt
rWillBeNoop(new WidgetToParentMap()))); | 45 DEFINE_STATIC_LOCAL_NO_REGISTER(OwnPtrWillBePersistent<WidgetToParentMap>, m
ap, (adoptPtrWillBeNoop(new WidgetToParentMap()))); |
| 46 return *map; | 46 return *map; |
| 47 } | 47 } |
| 48 | 48 |
| 49 typedef WillBeHeapHashSet<RefPtrWillBeMember<Widget>> WidgetSet; | 49 typedef WillBeHeapHashSet<RefPtrWillBeMember<Widget>> WidgetSet; |
| 50 static WidgetSet& widgetsPendingTemporaryRemovalFromParent() | 50 static WidgetSet& widgetsPendingTemporaryRemovalFromParent() |
| 51 { | 51 { |
| 52 // Widgets in this set will not leak because it will be cleared in | 52 // Widgets in this set will not leak because it will be cleared in |
| 53 // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOpera
tions. | 53 // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOpera
tions. |
| 54 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WidgetSet>, set, (adoptPtrWillBeN
oop(new WidgetSet()))); | 54 DEFINE_STATIC_LOCAL_NO_REGISTER(OwnPtrWillBePersistent<WidgetSet>, set, (ado
ptPtrWillBeNoop(new WidgetSet()))); |
| 55 return *set; | 55 return *set; |
| 56 } | 56 } |
| 57 | 57 |
| 58 WillBeHeapHashCountedSet<RawPtrWillBeMember<Node>>& SubframeLoadingDisabler::dis
abledSubtreeRoots() | 58 WillBeHeapHashCountedSet<RawPtrWillBeMember<Node>>& SubframeLoadingDisabler::dis
abledSubtreeRoots() |
| 59 { | 59 { |
| 60 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapHashCountedSet<RawPtrWi
llBeMember<Node>>>, nodes, (adoptPtrWillBeNoop(new WillBeHeapHashCountedSet<RawP
trWillBeMember<Node>>()))); | 60 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapHashCountedSet<RawPtrWi
llBeMember<Node>>>, nodes, (adoptPtrWillBeNoop(new WillBeHeapHashCountedSet<RawP
trWillBeMember<Node>>()))); |
| 61 return *nodes; | 61 return *nodes; |
| 62 } | 62 } |
| 63 | 63 |
| 64 static unsigned s_updateSuspendCount = 0; | 64 static unsigned s_updateSuspendCount = 0; |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 DEFINE_TRACE(HTMLFrameOwnerElement) | 318 DEFINE_TRACE(HTMLFrameOwnerElement) |
| 319 { | 319 { |
| 320 visitor->trace(m_contentFrame); | 320 visitor->trace(m_contentFrame); |
| 321 visitor->trace(m_widget); | 321 visitor->trace(m_widget); |
| 322 HTMLElement::trace(visitor); | 322 HTMLElement::trace(visitor); |
| 323 FrameOwner::trace(visitor); | 323 FrameOwner::trace(visitor); |
| 324 } | 324 } |
| 325 | 325 |
| 326 | 326 |
| 327 } // namespace blink | 327 } // namespace blink |
| OLD | NEW |