OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> | 3 * (C) 2000 Simon Hausmann <hausmann@kde.org> |
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
11 * | 11 * |
12 * This library is distributed in the hope that it will be useful, | 12 * This library is distributed in the hope that it will be useful, |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 * Library General Public License for more details. | 15 * Library General Public License for more details. |
16 * | 16 * |
17 * You should have received a copy of the GNU Library General Public License | 17 * You should have received a copy of the GNU Library General Public License |
18 * along with this library; see the file COPYING.LIB. If not, write to | 18 * along with this library; see the file COPYING.LIB. If not, write to |
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 * Boston, MA 02110-1301, USA. | 20 * Boston, MA 02110-1301, USA. |
21 * | 21 * |
22 */ | 22 */ |
23 | 23 |
24 #include "config.h" | 24 #include "config.h" |
25 #include "core/rendering/RenderFrame.h" | 25 #include "core/rendering/RenderFrame.h" |
26 | 26 |
27 #include "core/html/HTMLFrameElement.h" | 27 #include "core/html/HTMLFrameElement.h" |
28 #include "core/page/FrameView.h" | 28 #include "core/page/FrameView.h" |
29 #include "core/rendering/RenderView.h" | |
30 | 29 |
31 namespace WebCore { | 30 namespace WebCore { |
32 | 31 |
33 RenderFrame::RenderFrame(HTMLFrameElement* frame) | 32 RenderFrame::RenderFrame(HTMLFrameElement* frame) |
34 : RenderPart(frame) | 33 : RenderPart(frame) |
35 { | 34 { |
36 setInline(false); | 35 setInline(false); |
37 } | 36 } |
38 | 37 |
39 FrameEdgeInfo RenderFrame::edgeInfo() const | 38 FrameEdgeInfo RenderFrame::edgeInfo() const |
(...skipping 19 matching lines...) Expand all Loading... |
59 int marginWidth = element->marginWidth(); | 58 int marginWidth = element->marginWidth(); |
60 int marginHeight = element->marginHeight(); | 59 int marginHeight = element->marginHeight(); |
61 | 60 |
62 if (marginWidth != -1) | 61 if (marginWidth != -1) |
63 view->setMarginWidth(marginWidth); | 62 view->setMarginWidth(marginWidth); |
64 if (marginHeight != -1) | 63 if (marginHeight != -1) |
65 view->setMarginHeight(marginHeight); | 64 view->setMarginHeight(marginHeight); |
66 } | 65 } |
67 | 66 |
68 } // namespace WebCore | 67 } // namespace WebCore |
OLD | NEW |