Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

Issue 1475023002: Oilpan: hide persisted plugin object before disposing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698