| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) | 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) |
| 5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "bindings/v8/ScriptEventListener.h" | 29 #include "bindings/v8/ScriptEventListener.h" |
| 30 #include "core/dom/Attribute.h" | 30 #include "core/dom/Attribute.h" |
| 31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/dom/EventNames.h" | 32 #include "core/dom/EventNames.h" |
| 33 #include "core/html/parser/HTMLParserIdioms.h" | 33 #include "core/html/parser/HTMLParserIdioms.h" |
| 34 #include "core/loader/FrameLoader.h" | 34 #include "core/loader/FrameLoader.h" |
| 35 #include "core/page/FocusController.h" | 35 #include "core/page/FocusController.h" |
| 36 #include "core/page/Frame.h" | 36 #include "core/page/Frame.h" |
| 37 #include "core/page/FrameView.h" | 37 #include "core/page/FrameView.h" |
| 38 #include "core/page/Page.h" | 38 #include "core/page/Page.h" |
| 39 #include "core/page/Settings.h" | |
| 40 #include "core/platform/KURL.h" | |
| 41 #include "core/rendering/RenderPart.h" | 39 #include "core/rendering/RenderPart.h" |
| 42 | 40 |
| 43 namespace WebCore { | 41 namespace WebCore { |
| 44 | 42 |
| 45 using namespace HTMLNames; | 43 using namespace HTMLNames; |
| 46 | 44 |
| 47 HTMLFrameElementBase::HTMLFrameElementBase(const QualifiedName& tagName, Documen
t* document) | 45 HTMLFrameElementBase::HTMLFrameElementBase(const QualifiedName& tagName, Documen
t* document) |
| 48 : HTMLFrameOwnerElement(tagName, document) | 46 : HTMLFrameOwnerElement(tagName, document) |
| 49 , m_scrolling(ScrollbarAuto) | 47 , m_scrolling(ScrollbarAuto) |
| 50 , m_marginWidth(-1) | 48 , m_marginWidth(-1) |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 222 |
| 225 int HTMLFrameElementBase::height() | 223 int HTMLFrameElementBase::height() |
| 226 { | 224 { |
| 227 document()->updateLayoutIgnorePendingStylesheets(); | 225 document()->updateLayoutIgnorePendingStylesheets(); |
| 228 if (!renderBox()) | 226 if (!renderBox()) |
| 229 return 0; | 227 return 0; |
| 230 return renderBox()->height(); | 228 return renderBox()->height(); |
| 231 } | 229 } |
| 232 | 230 |
| 233 } // namespace WebCore | 231 } // namespace WebCore |
| OLD | NEW |