| Index: Source/core/frame/FrameView.cpp
|
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
|
| index 18c4e13031da4f4058b6f483b275d5989865b41f..c3a1d37dfc5faa078a5eb204cb939bee4247a18b 100644
|
| --- a/Source/core/frame/FrameView.cpp
|
| +++ b/Source/core/frame/FrameView.cpp
|
| @@ -300,7 +300,6 @@ void FrameView::init()
|
| {
|
| reset();
|
|
|
| - m_margins = LayoutSize(-1, -1); // undefined
|
| m_size = LayoutSize();
|
|
|
| // Propagate the marginwidth/height and scrolling modes to the view.
|
| @@ -309,12 +308,6 @@ void FrameView::init()
|
| HTMLFrameElementBase* frameElt = toHTMLFrameElementBase(ownerElement);
|
| if (frameElt->scrollingMode() == ScrollbarAlwaysOff)
|
| setCanHaveScrollbars(false);
|
| - LayoutUnit marginWidth = frameElt->marginWidth();
|
| - LayoutUnit marginHeight = frameElt->marginHeight();
|
| - if (marginWidth != -1)
|
| - setMarginWidth(marginWidth);
|
| - if (marginHeight != -1)
|
| - setMarginHeight(marginHeight);
|
| }
|
| }
|
|
|
| @@ -378,9 +371,6 @@ void FrameView::clear()
|
|
|
| reset();
|
|
|
| - if (RenderPart* renderer = m_frame->ownerRenderer())
|
| - renderer->viewCleared();
|
| -
|
| setScrollbarsSuppressed(true);
|
| }
|
|
|
| @@ -449,18 +439,6 @@ RenderView* FrameView::renderView() const
|
| return frame().contentRenderer();
|
| }
|
|
|
| -void FrameView::setMarginWidth(LayoutUnit w)
|
| -{
|
| - // make it update the rendering area when set
|
| - m_margins.setWidth(w);
|
| -}
|
| -
|
| -void FrameView::setMarginHeight(LayoutUnit h)
|
| -{
|
| - // make it update the rendering area when set
|
| - m_margins.setHeight(h);
|
| -}
|
| -
|
| void FrameView::setCanHaveScrollbars(bool canHaveScrollbars)
|
| {
|
| m_canHaveScrollbars = canHaveScrollbars;
|
|
|