Chromium Code Reviews| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 247 void HTMLPlugInElement::detach(const AttachContext& context) | 247 void HTMLPlugInElement::detach(const AttachContext& context) |
| 248 { | 248 { |
| 249 // Update the widget the next time we attach (detaching destroys the plugin) . | 249 // Update the widget the next time we attach (detaching destroys the plugin) . |
| 250 // FIXME: None of this "needsWidgetUpdate" related code looks right. | 250 // FIXME: None of this "needsWidgetUpdate" related code looks right. |
| 251 if (layoutObject() && !useFallbackContent()) | 251 if (layoutObject() && !useFallbackContent()) |
| 252 setNeedsWidgetUpdate(true); | 252 setNeedsWidgetUpdate(true); |
| 253 if (m_isDelayingLoadEvent) { | 253 if (m_isDelayingLoadEvent) { |
| 254 m_isDelayingLoadEvent = false; | 254 m_isDelayingLoadEvent = false; |
| 255 document().decrementLoadEventDelayCount(); | 255 document().decrementLoadEventDelayCount(); |
| 256 } | 256 } |
| 257 | |
|
Julien - ping for review
2015/10/01 00:24:40
Empty line removal? Unneeded churn?
dsinclair
2015/10/01 14:50:14
Leftover from debugging. Fixed.
| |
| 258 // Only try to persist a plugin widget we actually own. | 257 // Only try to persist a plugin widget we actually own. |
| 259 Widget* plugin = ownedWidget(); | 258 Widget* plugin = ownedWidget(); |
| 260 if (plugin && context.performingReattach) | 259 if (plugin && context.performingReattach) |
| 261 setPersistedPluginWidget(plugin); | 260 setPersistedPluginWidget(plugin); |
| 262 | 261 |
| 263 resetInstance(); | 262 resetInstance(); |
| 264 // Clear the widget; will trigger disposal of it with Oilpan. | 263 // Clear the widget; will trigger disposal of it with Oilpan. |
| 265 setWidget(nullptr); | 264 setWidget(nullptr); |
| 266 | 265 |
| 267 if (m_NPObject) { | 266 if (m_NPObject) { |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 635 return openShadowRoot(); | 634 return openShadowRoot(); |
| 636 } | 635 } |
| 637 | 636 |
| 638 void HTMLPlugInElement::lazyReattachIfNeeded() | 637 void HTMLPlugInElement::lazyReattachIfNeeded() |
| 639 { | 638 { |
| 640 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isIma geType()) | 639 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isIma geType()) |
| 641 lazyReattachIfAttached(); | 640 lazyReattachIfAttached(); |
| 642 } | 641 } |
| 643 | 642 |
| 644 } | 643 } |
| OLD | NEW |