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

Side by Side Diff: Source/core/layout/LayoutMultiColumnFlowThread.cpp

Issue 1287113002: Clean up PageBoundaryRule enum. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutFlowThread.h ('k') | Source/core/layout/LayoutMultiColumnSet.cpp » ('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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 { 903 {
904 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offset)) 904 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offset))
905 multicolSet->updateMinimumColumnHeight(offset, minHeight); 905 multicolSet->updateMinimumColumnHeight(offset, minHeight);
906 } 906 }
907 907
908 bool LayoutMultiColumnFlowThread::addForcedColumnBreak(LayoutUnit offset, Layout Object* /*breakChild*/, bool /*isBefore*/, LayoutUnit* offsetBreakAdjustment) 908 bool LayoutMultiColumnFlowThread::addForcedColumnBreak(LayoutUnit offset, Layout Object* /*breakChild*/, bool /*isBefore*/, LayoutUnit* offsetBreakAdjustment)
909 { 909 {
910 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offset)) { 910 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offset)) {
911 multicolSet->addContentRun(offset); 911 multicolSet->addContentRun(offset);
912 if (offsetBreakAdjustment) 912 if (offsetBreakAdjustment)
913 *offsetBreakAdjustment = pageLogicalHeightForOffset(offset) ? pageRe mainingLogicalHeightForOffset(offset, IncludePageBoundary) : LayoutUnit(); 913 *offsetBreakAdjustment = pageLogicalHeightForOffset(offset) ? pageRe mainingLogicalHeightForOffset(offset, AssociateWithFormerPage) : LayoutUnit();
914 return true; 914 return true;
915 } 915 }
916 return false; 916 return false;
917 } 917 }
918 918
919 bool LayoutMultiColumnFlowThread::isPageLogicalHeightKnown() const 919 bool LayoutMultiColumnFlowThread::isPageLogicalHeightKnown() const
920 { 920 {
921 if (LayoutMultiColumnSet* columnSet = lastMultiColumnSet()) 921 if (LayoutMultiColumnSet* columnSet = lastMultiColumnSet())
922 return columnSet->isPageLogicalHeightKnown(); 922 return columnSet->isPageLogicalHeightKnown();
923 return false; 923 return false;
924 } 924 }
925 925
926 } 926 }
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFlowThread.h ('k') | Source/core/layout/LayoutMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698