| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 814 } | 814 } |
| 815 | 815 |
| 816 void LocalFrame::unregisterPluginElement(HTMLPlugInElement* plugin) | 816 void LocalFrame::unregisterPluginElement(HTMLPlugInElement* plugin) |
| 817 { | 817 { |
| 818 ASSERT(m_pluginElements.contains(plugin)); | 818 ASSERT(m_pluginElements.contains(plugin)); |
| 819 m_pluginElements.remove(plugin); | 819 m_pluginElements.remove(plugin); |
| 820 } | 820 } |
| 821 | 821 |
| 822 void LocalFrame::clearWeakMembers(Visitor* visitor) | 822 void LocalFrame::clearWeakMembers(Visitor* visitor) |
| 823 { | 823 { |
| 824 Vector<HTMLPlugInElement*> deadPlugins; | 824 Vector<UntracedMember<HTMLPlugInElement>> deadPlugins; |
| 825 for (const auto& pluginElement : m_pluginElements) { | 825 for (const auto& pluginElement : m_pluginElements) { |
| 826 if (!Heap::isHeapObjectAlive(pluginElement)) { | 826 if (!Heap::isHeapObjectAlive(pluginElement)) { |
| 827 pluginElement->shouldDisposePlugin(); | 827 pluginElement->shouldDisposePlugin(); |
| 828 deadPlugins.append(pluginElement); | 828 deadPlugins.append(pluginElement); |
| 829 } | 829 } |
| 830 } | 830 } |
| 831 for (unsigned i = 0; i < deadPlugins.size(); ++i) | 831 for (unsigned i = 0; i < deadPlugins.size(); ++i) |
| 832 m_pluginElements.remove(deadPlugins[i]); | 832 m_pluginElements.remove(deadPlugins[i]); |
| 833 } | 833 } |
| 834 #endif | 834 #endif |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 if (!context) | 877 if (!context) |
| 878 return; | 878 return; |
| 879 | 879 |
| 880 WebSecurityOrigin securityOrigin(context->securityOrigin()); | 880 WebSecurityOrigin securityOrigin(context->securityOrigin()); |
| 881 frameScheduler()->setFrameOrigin(&securityOrigin); | 881 frameScheduler()->setFrameOrigin(&securityOrigin); |
| 882 } | 882 } |
| 883 | 883 |
| 884 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); | 884 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); |
| 885 | 885 |
| 886 } // namespace blink | 886 } // namespace blink |
| OLD | NEW |