OLD | NEW |
1 /** | 1 /** |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. | 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 } | 107 } |
108 #endif | 108 #endif |
109 | 109 |
110 void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget) | 110 void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget) |
111 { | 111 { |
112 if (m_persistedPluginWidget == widget) | 112 if (m_persistedPluginWidget == widget) |
113 return; | 113 return; |
114 #if ENABLE(OILPAN) | 114 #if ENABLE(OILPAN) |
115 unregisterAsRenderlessIfNeeded(); | 115 unregisterAsRenderlessIfNeeded(); |
116 registerAsRenderless(widget); | 116 registerAsRenderless(widget); |
117 if (m_persistedPluginWidget) | 117 if (m_persistedPluginWidget) { |
| 118 m_persistedPluginWidget->hide(); |
118 m_persistedPluginWidget->dispose(); | 119 m_persistedPluginWidget->dispose(); |
| 120 } |
119 #endif | 121 #endif |
120 m_persistedPluginWidget = widget; | 122 m_persistedPluginWidget = widget; |
121 } | 123 } |
122 | 124 |
123 #if ENABLE(OILPAN) | 125 #if ENABLE(OILPAN) |
124 bool HTMLPlugInElement::unregisterAsRenderlessIfNeeded() | 126 bool HTMLPlugInElement::unregisterAsRenderlessIfNeeded() |
125 { | 127 { |
126 if (!m_persistedPluginWidget || !m_persistedPluginWidget->isPluginView()) | 128 if (!m_persistedPluginWidget || !m_persistedPluginWidget->isPluginView()) |
127 return false; | 129 return false; |
128 | 130 |
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
661 return openShadowRoot(); | 663 return openShadowRoot(); |
662 } | 664 } |
663 | 665 |
664 void HTMLPlugInElement::lazyReattachIfNeeded() | 666 void HTMLPlugInElement::lazyReattachIfNeeded() |
665 { | 667 { |
666 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isIma
geType()) | 668 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isIma
geType()) |
667 lazyReattachIfAttached(); | 669 lazyReattachIfAttached(); |
668 } | 670 } |
669 | 671 |
670 } | 672 } |
OLD | NEW |