| Index: Source/core/html/HTMLFrameSetElement.cpp
|
| diff --git a/Source/core/html/HTMLFrameSetElement.cpp b/Source/core/html/HTMLFrameSetElement.cpp
|
| index 6e17a3928c1f39783398e7317fbf9ae6c80c04ca..37b4cd192da12f3691dabaa60d6d0c45c3011fa4 100644
|
| --- a/Source/core/html/HTMLFrameSetElement.cpp
|
| +++ b/Source/core/html/HTMLFrameSetElement.cpp
|
| @@ -170,18 +170,18 @@ void HTMLFrameSetElement::attach(const AttachContext& context)
|
| // Inherit default settings from parent frameset
|
| // FIXME: This is not dynamic.
|
| for (ContainerNode* node = parentNode(); node; node = node->parentNode()) {
|
| - if (node->hasTagName(framesetTag)) {
|
| - HTMLFrameSetElement* frameset = toHTMLFrameSetElement(node);
|
| + if (isHTMLFrameSetElement(*node)) {
|
| + HTMLFrameSetElement& frameset = toHTMLFrameSetElement(*node);
|
| if (!m_frameborderSet)
|
| - m_frameborder = frameset->hasFrameBorder();
|
| + m_frameborder = frameset.hasFrameBorder();
|
| if (m_frameborder) {
|
| if (!m_borderSet)
|
| - m_border = frameset->border();
|
| + m_border = frameset.border();
|
| if (!m_borderColorSet)
|
| - m_borderColorSet = frameset->hasBorderColor();
|
| + m_borderColorSet = frameset.hasBorderColor();
|
| }
|
| if (!m_noresize)
|
| - m_noresize = frameset->noResize();
|
| + m_noresize = frameset.noResize();
|
| break;
|
| }
|
| }
|
| @@ -220,7 +220,7 @@ void HTMLFrameSetElement::willRecalcStyle(StyleRecalcChange)
|
| DOMWindow* HTMLFrameSetElement::anonymousNamedGetter(const AtomicString& name)
|
| {
|
| Element* frameElement = children()->namedItem(name);
|
| - if (!frameElement || !frameElement->hasTagName(HTMLNames::frameTag))
|
| + if (!isHTMLFrameElement(frameElement))
|
| return 0;
|
| Document* document = toHTMLFrameElement(frameElement)->contentDocument();
|
| if (!document || !document->frame())
|
|
|