diff options
Diffstat (limited to 'WebCore/rendering/RenderFrame.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFrame.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp index ffe87c2..3932c9a 100644 --- a/WebCore/rendering/RenderFrame.cpp +++ b/WebCore/rendering/RenderFrame.cpp @@ -37,7 +37,7 @@ namespace WebCore { RenderFrame::RenderFrame(HTMLFrameElement* frame) - : RenderPart(frame) + : RenderFrameBase(frame) { setInline(false); } @@ -65,6 +65,7 @@ void RenderFrame::viewCleared() view->setMarginHeight(marginh); } +<<<<<<< HEAD #ifdef FLATTEN_FRAMESET void RenderFrame::layout() { @@ -145,4 +146,6 @@ void RenderFrame::layoutWithFlattening(bool fixedWidth, bool fixedHeight) setNeedsLayout(false); } +======= +>>>>>>> webkit.org at r58033 } // namespace WebCore |