diff options
Diffstat (limited to 'Source/WebCore/html/HTMLPlugInElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLPlugInElement.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/Source/WebCore/html/HTMLPlugInElement.cpp b/Source/WebCore/html/HTMLPlugInElement.cpp index a6c24522c..5bdf60d44 100644 --- a/Source/WebCore/html/HTMLPlugInElement.cpp +++ b/Source/WebCore/html/HTMLPlugInElement.cpp @@ -88,6 +88,11 @@ void HTMLPlugInElement::detach() HTMLFrameOwnerElement::detach(); } +void HTMLPlugInElement::resetInstance() +{ + m_instance.clear(); +} + PassScriptInstance HTMLPlugInElement::getInstance() { Frame* frame = document()->frame(); @@ -142,22 +147,22 @@ bool HTMLPlugInElement::isPresentationAttribute(const QualifiedName& name) const return HTMLFrameOwnerElement::isPresentationAttribute(name); } -void HTMLPlugInElement::collectStyleForAttribute(Attribute* attr, StylePropertySet* style) +void HTMLPlugInElement::collectStyleForAttribute(const Attribute& attribute, StylePropertySet* style) { - if (attr->name() == widthAttr) - addHTMLLengthToStyle(style, CSSPropertyWidth, attr->value()); - else if (attr->name() == heightAttr) - addHTMLLengthToStyle(style, CSSPropertyHeight, attr->value()); - else if (attr->name() == vspaceAttr) { - addHTMLLengthToStyle(style, CSSPropertyMarginTop, attr->value()); - addHTMLLengthToStyle(style, CSSPropertyMarginBottom, attr->value()); - } else if (attr->name() == hspaceAttr) { - addHTMLLengthToStyle(style, CSSPropertyMarginLeft, attr->value()); - addHTMLLengthToStyle(style, CSSPropertyMarginRight, attr->value()); - } else if (attr->name() == alignAttr) - applyAlignmentAttributeToStyle(attr, style); + if (attribute.name() == widthAttr) + addHTMLLengthToStyle(style, CSSPropertyWidth, attribute.value()); + else if (attribute.name() == heightAttr) + addHTMLLengthToStyle(style, CSSPropertyHeight, attribute.value()); + else if (attribute.name() == vspaceAttr) { + addHTMLLengthToStyle(style, CSSPropertyMarginTop, attribute.value()); + addHTMLLengthToStyle(style, CSSPropertyMarginBottom, attribute.value()); + } else if (attribute.name() == hspaceAttr) { + addHTMLLengthToStyle(style, CSSPropertyMarginLeft, attribute.value()); + addHTMLLengthToStyle(style, CSSPropertyMarginRight, attribute.value()); + } else if (attribute.name() == alignAttr) + applyAlignmentAttributeToStyle(attribute, style); else - HTMLFrameOwnerElement::collectStyleForAttribute(attr, style); + HTMLFrameOwnerElement::collectStyleForAttribute(attribute, style); } void HTMLPlugInElement::defaultEventHandler(Event* event) |