From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- WebCore/html/HTMLPlugInElement.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'WebCore/html/HTMLPlugInElement.cpp') diff --git a/WebCore/html/HTMLPlugInElement.cpp b/WebCore/html/HTMLPlugInElement.cpp index 25ef751..bf2722b 100644 --- a/WebCore/html/HTMLPlugInElement.cpp +++ b/WebCore/html/HTMLPlugInElement.cpp @@ -49,10 +49,11 @@ using namespace HTMLNames; HTMLPlugInElement::HTMLPlugInElement(const QualifiedName& tagName, Document* doc) : HTMLFrameOwnerElement(tagName, doc) + , m_inBeforeLoadEventHandler(false) #if ENABLE(NETSCAPE_PLUGIN_API) , m_NPObject(0) - , m_isCapturingMouseEvents(false) #endif + , m_isCapturingMouseEvents(false) { } @@ -100,6 +101,12 @@ PassScriptInstance HTMLPlugInElement::getInstance() const Widget* HTMLPlugInElement::pluginWidget() const { + if (m_inBeforeLoadEventHandler) { + // The plug-in hasn't loaded yet, and it makes no sense to try to load if beforeload handler happened to touch the plug-in element. + // That would recursively call beforeload for the same element. + return 0; + } + RenderWidget* renderWidget = renderWidgetForJSBindings(); if (!renderWidget) return 0; -- cgit v1.1