Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3

Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 7 insertions, 6 deletions

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
index b396b0b34..8b8eaa0bc 100644
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
@@ -51,13 +51,14 @@ bool NetscapePlugin::platformPostInitialize()
     }
 #endif
 
-    if (m_impl) {
-        m_npWindow.type = m_impl->windowType();
-        m_npWindow.window = m_impl->window();
-        m_npWindow.ws_info = m_impl->windowSystemInfo();
-        callSetWindow();
-    }
+    // Windowed plugins need a platform implementation.
+    if (!m_impl)
+        return !m_isWindowed;
 
+    m_npWindow.type = m_impl->windowType();
+    m_npWindow.window = m_impl->window();
+    m_npWindow.ws_info = m_impl->windowSystemInfo();
+    callSetWindow();
     return true;
 }