Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1032)

Unified Diff: Source/core/frame/FrameView.cpp

Issue 136793014: Remove m_margins member from FrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/rendering/RenderEmbeddedObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/rendering/RenderEmbeddedObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698