| 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 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 void LocalFrame::unregisterPluginElement(HTMLPlugInElement* plugin) | 773 void LocalFrame::unregisterPluginElement(HTMLPlugInElement* plugin) |
| 774 { | 774 { |
| 775 ASSERT(m_pluginElements.contains(plugin)); | 775 ASSERT(m_pluginElements.contains(plugin)); |
| 776 m_pluginElements.remove(plugin); | 776 m_pluginElements.remove(plugin); |
| 777 } | 777 } |
| 778 | 778 |
| 779 void LocalFrame::clearWeakMembers(Visitor* visitor) | 779 void LocalFrame::clearWeakMembers(Visitor* visitor) |
| 780 { | 780 { |
| 781 Vector<HTMLPlugInElement*> deadPlugins; | 781 Vector<HTMLPlugInElement*> deadPlugins; |
| 782 for (const auto& pluginElement : m_pluginElements) { | 782 for (const auto& pluginElement : m_pluginElements) { |
| 783 if (!visitor->isHeapObjectAlive(pluginElement)) { | 783 if (!Heap::isHeapObjectAlive(pluginElement)) { |
| 784 pluginElement->shouldDisposePlugin(); | 784 pluginElement->shouldDisposePlugin(); |
| 785 deadPlugins.append(pluginElement); | 785 deadPlugins.append(pluginElement); |
| 786 } | 786 } |
| 787 } | 787 } |
| 788 for (unsigned i = 0; i < deadPlugins.size(); ++i) | 788 for (unsigned i = 0; i < deadPlugins.size(); ++i) |
| 789 m_pluginElements.remove(deadPlugins[i]); | 789 m_pluginElements.remove(deadPlugins[i]); |
| 790 } | 790 } |
| 791 #endif | 791 #endif |
| 792 | 792 |
| 793 String LocalFrame::localLayerTreeAsText(unsigned flags) const | 793 String LocalFrame::localLayerTreeAsText(unsigned flags) const |
| (...skipping 19 matching lines...) Expand all Loading... |
| 813 , m_textZoomFactor(parentTextZoomFactor(this)) | 813 , m_textZoomFactor(parentTextZoomFactor(this)) |
| 814 , m_inViewSourceMode(false) | 814 , m_inViewSourceMode(false) |
| 815 { | 815 { |
| 816 if (isLocalRoot()) | 816 if (isLocalRoot()) |
| 817 m_instrumentingAgents = InstrumentingAgents::create(); | 817 m_instrumentingAgents = InstrumentingAgents::create(); |
| 818 else | 818 else |
| 819 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 819 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 820 } | 820 } |
| 821 | 821 |
| 822 } // namespace blink | 822 } // namespace blink |
| OLD | NEW |