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

Unified Diff: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

Issue 1872653002: Plugin element widget may be a RemoteFrameView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/FlagExpectations/site-per-process ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
index 993d2f6cbe477df8b8526b5b5fae4e7e248d282f..8e7a02ac3da3ccb566d503c65eb6edb323e09406 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
@@ -86,16 +86,14 @@ void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget)
{
if (m_persistedPluginWidget == widget)
return;
-#if ENABLE(OILPAN)
if (m_persistedPluginWidget) {
if (m_persistedPluginWidget->isPluginView()) {
m_persistedPluginWidget->hide();
m_persistedPluginWidget->dispose();
} else {
- ASSERT(m_persistedPluginWidget->isFrameView());
+ ASSERT(m_persistedPluginWidget->isFrameView() || m_persistedPluginWidget->isRemoteFrameView());
}
}
-#endif
m_persistedPluginWidget = widget;
}
« no previous file with comments | « third_party/WebKit/LayoutTests/FlagExpectations/site-per-process ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698