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

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

Issue 201573009: Remove -webkit-column-progression and -webkit-column-axis properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master (fixed the DOS-style line break issue there) Created 6 years, 9 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/RenderBlock.cpp ('k') | Source/core/rendering/style/RenderStyle.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 4218 matching lines...) Expand 10 before | Expand all | Expand 10 after
4229 bool hasTopOverflow = !style()->isLeftToRightDirection() && !isHorizonta lWritingMode(); 4229 bool hasTopOverflow = !style()->isLeftToRightDirection() && !isHorizonta lWritingMode();
4230 bool hasLeftOverflow = !style()->isLeftToRightDirection() && isHorizonta lWritingMode(); 4230 bool hasLeftOverflow = !style()->isLeftToRightDirection() && isHorizonta lWritingMode();
4231 if (isFlexibleBox() && style()->isReverseFlexDirection()) { 4231 if (isFlexibleBox() && style()->isReverseFlexDirection()) {
4232 RenderFlexibleBox* flexibleBox = toRenderFlexibleBox(this); 4232 RenderFlexibleBox* flexibleBox = toRenderFlexibleBox(this);
4233 if (flexibleBox->isHorizontalFlow()) 4233 if (flexibleBox->isHorizontalFlow())
4234 hasLeftOverflow = true; 4234 hasLeftOverflow = true;
4235 else 4235 else
4236 hasTopOverflow = true; 4236 hasTopOverflow = true;
4237 } 4237 }
4238 4238
4239 if (hasColumns() && style()->columnProgression() == ReverseColumnProgres sion) {
4240 if (isHorizontalWritingMode() ^ !style()->hasInlineColumnAxis())
4241 hasLeftOverflow = !hasLeftOverflow;
4242 else
4243 hasTopOverflow = !hasTopOverflow;
4244 }
4245
4246 if (!hasTopOverflow) 4239 if (!hasTopOverflow)
4247 overflowRect.shiftYEdgeTo(max(overflowRect.y(), clientBox.y())); 4240 overflowRect.shiftYEdgeTo(max(overflowRect.y(), clientBox.y()));
4248 else 4241 else
4249 overflowRect.shiftMaxYEdgeTo(min(overflowRect.maxY(), clientBox.maxY ())); 4242 overflowRect.shiftMaxYEdgeTo(min(overflowRect.maxY(), clientBox.maxY ()));
4250 if (!hasLeftOverflow) 4243 if (!hasLeftOverflow)
4251 overflowRect.shiftXEdgeTo(max(overflowRect.x(), clientBox.x())); 4244 overflowRect.shiftXEdgeTo(max(overflowRect.x(), clientBox.x()));
4252 else 4245 else
4253 overflowRect.shiftMaxXEdgeTo(min(overflowRect.maxX(), clientBox.maxX ())); 4246 overflowRect.shiftMaxXEdgeTo(min(overflowRect.maxX(), clientBox.maxX ()));
4254 4247
4255 // Now re-test with the adjusted rectangle and see if it has become unre achable or fully 4248 // Now re-test with the adjusted rectangle and see if it has become unre achable or fully
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
4692 return 0; 4685 return 0;
4693 4686
4694 if (!layoutState && !flowThreadContainingBlock()) 4687 if (!layoutState && !flowThreadContainingBlock())
4695 return 0; 4688 return 0;
4696 4689
4697 RenderBlock* containerBlock = containingBlock(); 4690 RenderBlock* containerBlock = containingBlock();
4698 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4691 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4699 } 4692 }
4700 4693
4701 } // namespace WebCore 4694 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698