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

Side by Side Diff: Source/core/rendering/RenderFrame.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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderFrame.h ('k') | Source/core/rendering/RenderPart.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 29 matching lines...) Expand all
40 HTMLFrameElement* element = toHTMLFrameElement(node()); 40 HTMLFrameElement* element = toHTMLFrameElement(node());
41 return FrameEdgeInfo(element->noResize(), element->hasFrameBorder()); 41 return FrameEdgeInfo(element->noResize(), element->hasFrameBorder());
42 } 42 }
43 43
44 void RenderFrame::updateFromElement() 44 void RenderFrame::updateFromElement()
45 { 45 {
46 if (parent() && parent()->isFrameSet()) 46 if (parent() && parent()->isFrameSet())
47 toRenderFrameSet(parent())->notifyFrameEdgeInfoChanged(); 47 toRenderFrameSet(parent())->notifyFrameEdgeInfoChanged();
48 } 48 }
49 49
50 void RenderFrame::viewCleared()
51 {
52 HTMLFrameElement* element = toHTMLFrameElement(node());
53 if (!element || !widget() || !widget()->isFrameView())
54 return;
55
56 FrameView* view = toFrameView(widget());
57
58 int marginWidth = element->marginWidth();
59 int marginHeight = element->marginHeight();
60
61 if (marginWidth != -1)
62 view->setMarginWidth(marginWidth);
63 if (marginHeight != -1)
64 view->setMarginHeight(marginHeight);
65 }
66
67 } // namespace WebCore 50 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFrame.h ('k') | Source/core/rendering/RenderPart.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698