| 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. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 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" | 29 #include "core/rendering/RenderView.h" |
| 30 | 30 |
| 31 namespace WebCore { | 31 namespace WebCore { |
| 32 | 32 |
| 33 RenderFrame::RenderFrame(HTMLFrameElement* frame) | 33 RenderFrame::RenderFrame(HTMLFrameElement* frame) |
| 34 : RenderFrameBase(frame) | 34 : RenderPart(frame) |
| 35 { | 35 { |
| 36 setInline(false); | 36 setInline(false); |
| 37 } | 37 } |
| 38 | 38 |
| 39 FrameEdgeInfo RenderFrame::edgeInfo() const | 39 FrameEdgeInfo RenderFrame::edgeInfo() const |
| 40 { | 40 { |
| 41 HTMLFrameElement* element = static_cast<HTMLFrameElement*>(node()); | 41 HTMLFrameElement* element = static_cast<HTMLFrameElement*>(node()); |
| 42 return FrameEdgeInfo(element->noResize(), element->hasFrameBorder()); | 42 return FrameEdgeInfo(element->noResize(), element->hasFrameBorder()); |
| 43 } | 43 } |
| 44 | 44 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 59 int marginWidth = element->marginWidth(); | 59 int marginWidth = element->marginWidth(); |
| 60 int marginHeight = element->marginHeight(); | 60 int marginHeight = element->marginHeight(); |
| 61 | 61 |
| 62 if (marginWidth != -1) | 62 if (marginWidth != -1) |
| 63 view->setMarginWidth(marginWidth); | 63 view->setMarginWidth(marginWidth); |
| 64 if (marginHeight != -1) | 64 if (marginHeight != -1) |
| 65 view->setMarginHeight(marginHeight); | 65 view->setMarginHeight(marginHeight); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace WebCore | 68 } // namespace WebCore |
| OLD | NEW |