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; |
} |