From 88a04ac016f57c2d78e714682445dff2e7db4ade Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 11 Sep 2012 19:54:20 +0200 Subject: Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206) This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection and allow for further simplifications in the future --- Source/WebKit2/WebProcess/Plugins/PluginView.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'Source/WebKit2/WebProcess/Plugins/PluginView.cpp') diff --git a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp index 0a0c6b63d..8f50d8706 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp +++ b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp @@ -550,19 +550,8 @@ JSObject* PluginView::scriptObject(JSGlobalObject* globalObject) if (m_isWaitingForSynchronousInitialization) return 0; - // The plug-in can be null here if it failed to initialize previously. - if (!m_plugin) - return 0; - - // If the plug-in exists but is not initialized then we're still initializing asynchronously. - // We need to wait here until initialization has either succeeded or failed. - if (m_plugin->isBeingAsynchronouslyInitialized()) { - m_isWaitingForSynchronousInitialization = true; - m_plugin->waitForAsynchronousInitialization(); - m_isWaitingForSynchronousInitialization = false; - } - - // The plug-in can be null here if it still failed to initialize. + // We might not have started initialization of the plug-in yet, the plug-in might be in the middle + // of being initializing asynchronously, or initialization might have previously failed. if (!m_isInitialized || !m_plugin) return 0; -- cgit v1.2.1