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 11 matching lines...) Expand all Loading... |
22 */ | 22 */ |
23 | 23 |
24 #include "config.h" | 24 #include "config.h" |
25 #include "core/html/HTMLFrameElementBase.h" | 25 #include "core/html/HTMLFrameElementBase.h" |
26 | 26 |
27 #include "HTMLNames.h" | 27 #include "HTMLNames.h" |
28 #include "bindings/v8/ScriptController.h" | 28 #include "bindings/v8/ScriptController.h" |
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/events/ThreadLocalEventNames.h" | |
33 #include "core/frame/FrameView.h" | 32 #include "core/frame/FrameView.h" |
34 #include "core/frame/LocalFrame.h" | 33 #include "core/frame/LocalFrame.h" |
35 #include "core/html/parser/HTMLParserIdioms.h" | 34 #include "core/html/parser/HTMLParserIdioms.h" |
36 #include "core/loader/FrameLoader.h" | 35 #include "core/loader/FrameLoader.h" |
37 #include "core/page/FocusController.h" | 36 #include "core/page/FocusController.h" |
38 #include "core/page/Page.h" | 37 #include "core/page/Page.h" |
39 #include "core/rendering/RenderPart.h" | 38 #include "core/rendering/RenderPart.h" |
40 | 39 |
41 namespace WebCore { | 40 namespace WebCore { |
42 | 41 |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 | 223 |
225 int HTMLFrameElementBase::height() | 224 int HTMLFrameElementBase::height() |
226 { | 225 { |
227 document().updateLayoutIgnorePendingStylesheets(); | 226 document().updateLayoutIgnorePendingStylesheets(); |
228 if (!renderBox()) | 227 if (!renderBox()) |
229 return 0; | 228 return 0; |
230 return renderBox()->height(); | 229 return renderBox()->height(); |
231 } | 230 } |
232 | 231 |
233 } // namespace WebCore | 232 } // namespace WebCore |
OLD | NEW |