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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 855413002: [New Multicolumn] Support for block direction margins on spanners. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: code review - add descriptions to tests. Created 5 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/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderMultiColumnSet.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) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 parentToInvalidate = parentToInvalidate->parent(); 249 parentToInvalidate = parentToInvalidate->parent();
250 } 250 }
251 } 251 }
252 252
253 if (isDocumentElement() || isBody()) { 253 if (isDocumentElement() || isBody()) {
254 document().view()->recalculateScrollbarOverlayStyle(); 254 document().view()->recalculateScrollbarOverlayStyle();
255 document().view()->recalculateCustomScrollbarStyle(); 255 document().view()->recalculateCustomScrollbarStyle();
256 } 256 }
257 updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle); 257 updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle);
258 updateGridPositionAfterStyleChange(oldStyle); 258 updateGridPositionAfterStyleChange(oldStyle);
259
260 if (RenderMultiColumnSpannerPlaceholder* placeholder = this->spannerPlacehol der())
261 placeholder->updateMarginProperties();
259 } 262 }
260 263
261 void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle) 264 void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle)
262 { 265 {
263 const ShapeValue* shapeOutside = style.shapeOutside(); 266 const ShapeValue* shapeOutside = style.shapeOutside();
264 const ShapeValue* oldShapeOutside = oldStyle ? oldStyle->shapeOutside() : Re nderStyle::initialShapeOutside(); 267 const ShapeValue* oldShapeOutside = oldStyle ? oldStyle->shapeOutside() : Re nderStyle::initialShapeOutside();
265 268
266 Length shapeMargin = style.shapeMargin(); 269 Length shapeMargin = style.shapeMargin();
267 Length oldShapeMargin = oldStyle ? oldStyle->shapeMargin() : RenderStyle::in itialShapeMargin(); 270 Length oldShapeMargin = oldStyle ? oldStyle->shapeMargin() : RenderStyle::in itialShapeMargin();
268 271
(...skipping 4288 matching lines...) Expand 10 before | Expand all | Expand 10 after
4557 computedValues.m_margins.m_end = marginEnd(); 4560 computedValues.m_margins.m_end = marginEnd();
4558 4561
4559 setLogicalTop(oldLogicalTop); 4562 setLogicalTop(oldLogicalTop);
4560 setLogicalWidth(oldLogicalWidth); 4563 setLogicalWidth(oldLogicalWidth);
4561 setLogicalLeft(oldLogicalLeft); 4564 setLogicalLeft(oldLogicalLeft);
4562 setMarginLeft(oldMarginLeft); 4565 setMarginLeft(oldMarginLeft);
4563 setMarginRight(oldMarginRight); 4566 setMarginRight(oldMarginRight);
4564 } 4567 }
4565 4568
4566 } // namespace blink 4569 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderMultiColumnSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698