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