diff options
Diffstat (limited to 'WebCore/html/HTMLObjectElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLObjectElement.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp index e9c6f60..2b51286 100644 --- a/WebCore/html/HTMLObjectElement.cpp +++ b/WebCore/html/HTMLObjectElement.cpp @@ -25,7 +25,6 @@ #include "HTMLObjectElement.h" #include "Attribute.h" -#include "CSSHelper.h" #include "EventNames.h" #include "ExceptionCode.h" #include "Frame.h" @@ -34,6 +33,7 @@ #include "HTMLImageLoader.h" #include "HTMLNames.h" #include "HTMLParamElement.h" +#include "HTMLParserIdioms.h" #include "MIMETypeRegistry.h" #include "RenderEmbeddedObject.h" #include "RenderImage.h" @@ -77,7 +77,7 @@ void HTMLObjectElement::parseMappedAttribute(Attribute* attr) if (!isImageType() && m_imageLoader) m_imageLoader.clear(); } else if (attr->name() == dataAttr) { - m_url = deprecatedParseURL(attr->value()); + m_url = stripLeadingAndTrailingHTMLSpaces(attr->value()); if (renderer()) { setNeedsWidgetUpdate(true); if (isImageType()) { @@ -182,7 +182,7 @@ void HTMLObjectElement::parametersForPlugin(Vector<String>& paramNames, Vector<S // FIXME: url adjustment does not belong in this function. if (url.isEmpty() && urlParameter.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url"))) - urlParameter = deprecatedParseURL(p->value()); + urlParameter = stripLeadingAndTrailingHTMLSpaces(p->value()); // FIXME: serviceType calculation does not belong in this function. if (serviceType.isEmpty() && equalIgnoringCase(name, "type")) { serviceType = p->value(); @@ -279,7 +279,10 @@ void HTMLObjectElement::updateWidget(bool onlyCreateNonNetscapePlugins) if (onlyCreateNonNetscapePlugins && wouldLoadAsNetscapePlugin(url, serviceType)) return; + ASSERT(!m_inBeforeLoadEventHandler); + m_inBeforeLoadEventHandler = true; bool beforeLoadAllowedLoad = dispatchBeforeLoadEvent(url); + m_inBeforeLoadEventHandler = false; // beforeload events can modify the DOM, potentially causing // RenderWidget::destroy() to be called. Ensure we haven't been |