diff options
Diffstat (limited to 'WebCore/html/HTMLFrameElementBase.cpp')
| -rw-r--r-- | WebCore/html/HTMLFrameElementBase.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/html/HTMLFrameElementBase.cpp b/WebCore/html/HTMLFrameElementBase.cpp index 1c80155..59e7d46 100644 --- a/WebCore/html/HTMLFrameElementBase.cpp +++ b/WebCore/html/HTMLFrameElementBase.cpp @@ -3,7 +3,7 @@ * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann (hausmann@kde.org) * (C) 2001 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -43,8 +43,8 @@ namespace WebCore { using namespace HTMLNames; -HTMLFrameElementBase::HTMLFrameElementBase(const QualifiedName& tagName, Document *doc) - : HTMLFrameOwnerElement(tagName, doc) +HTMLFrameElementBase::HTMLFrameElementBase(const QualifiedName& tagName, Document* doc, bool createdByParser) + : HTMLFrameOwnerElement(tagName, doc, createdByParser) , m_scrolling(ScrollbarAuto) , m_marginWidth(-1) , m_marginHeight(-1) @@ -131,7 +131,7 @@ void HTMLFrameElementBase::parseMappedAttribute(MappedAttribute *attr) } else if (attr->name() == scrollingAttr) { // Auto and yes both simply mean "allow scrolling." No means "don't allow scrolling." if (equalIgnoringCase(attr->value(), "auto") || equalIgnoringCase(attr->value(), "yes")) - m_scrolling = ScrollbarAuto; + m_scrolling = document()->frameElementsShouldIgnoreScrolling() ? ScrollbarAlwaysOff : ScrollbarAuto; else if (equalIgnoringCase(attr->value(), "no")) m_scrolling = ScrollbarAlwaysOff; // FIXME: If we are already attached, this has no effect. @@ -311,7 +311,7 @@ int HTMLFrameElementBase::width() const return 0; document()->updateLayoutIgnorePendingStylesheets(); - return renderer()->width(); + return toRenderBox(renderer())->width(); } int HTMLFrameElementBase::height() const @@ -320,7 +320,7 @@ int HTMLFrameElementBase::height() const return 0; document()->updateLayoutIgnorePendingStylesheets(); - return renderer()->height(); + return toRenderBox(renderer())->height(); } } // namespace WebCore |