Skip to content

Commit

Permalink
Oilpan: hide persisted plugin object before disposing.
Browse files Browse the repository at this point in the history
When clearing out the persisted plugin object, hide the object before
going ahead with the disposal. This mirrors what will happen non-Oilpan.

R=haraken
BUG=561473

Review URL: https://codereview.chromium.org/1475023002

Cr-Commit-Position: refs/heads/master@{#361665}
  • Loading branch information
sigbjornf authored and Commit bot committed Nov 25, 2015
1 parent 880981b commit 1598eab
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@ void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget)
#if ENABLE(OILPAN)
unregisterAsRenderlessIfNeeded();
registerAsRenderless(widget);
if (m_persistedPluginWidget)
if (m_persistedPluginWidget) {
m_persistedPluginWidget->hide();
m_persistedPluginWidget->dispose();
}
#endif
m_persistedPluginWidget = widget;
}
Expand Down

0 comments on commit 1598eab

Please sign in to comment.