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

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

Issue 2059143002: "up-to-date" should only use hyphens when used as compound modifier of a noun (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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
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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(baselineInFlowThrea d); 372 LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(baselineInFlowThrea d);
373 if (!columnSet) 373 if (!columnSet)
374 return baselineInFlowThread.toInt(); 374 return baselineInFlowThread.toInt();
375 return (baselineInFlowThread - columnSet->pageLogicalTopForOffset(baselineIn FlowThread)).ceil(); 375 return (baselineInFlowThread - columnSet->pageLogicalTopForOffset(baselineIn FlowThread)).ceil();
376 } 376 }
377 377
378 LayoutMultiColumnSet* LayoutMultiColumnFlowThread::columnSetAtBlockOffset(Layout Unit offset) const 378 LayoutMultiColumnSet* LayoutMultiColumnFlowThread::columnSetAtBlockOffset(Layout Unit offset) const
379 { 379 {
380 if (LayoutMultiColumnSet* columnSet = m_lastSetWorkedOn) { 380 if (LayoutMultiColumnSet* columnSet = m_lastSetWorkedOn) {
381 // Layout in progress. We are calculating the set heights as we speak, s o the column set range 381 // Layout in progress. We are calculating the set heights as we speak, s o the column set range
382 // information is not up-to-date. 382 // information is not up to date.
383 while (columnSet->logicalTopInFlowThread() > offset) { 383 while (columnSet->logicalTopInFlowThread() > offset) {
384 // Sometimes we have to use a previous set. This happens when we're working with a block 384 // Sometimes we have to use a previous set. This happens when we're working with a block
385 // that contains a spanner (so that there's a column set both before and after the 385 // that contains a spanner (so that there's a column set both before and after the
386 // spanner, and both sets contain said block). 386 // spanner, and both sets contain said block).
387 LayoutMultiColumnSet* previousSet = columnSet->previousSiblingMultiC olumnSet(); 387 LayoutMultiColumnSet* previousSet = columnSet->previousSiblingMultiC olumnSet();
388 if (!previousSet) 388 if (!previousSet)
389 break; 389 break;
390 columnSet = previousSet; 390 columnSet = previousSet;
391 } 391 }
392 return columnSet; 392 return columnSet;
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 } 1041 }
1042 if (canContainSpannerInParentFragmentationContext(*object)) 1042 if (canContainSpannerInParentFragmentationContext(*object))
1043 next = object->nextInPreOrder(&root); 1043 next = object->nextInPreOrder(&root);
1044 else 1044 else
1045 next = object->nextInPreOrderAfterChildren(&root); 1045 next = object->nextInPreOrderAfterChildren(&root);
1046 } 1046 }
1047 return true; 1047 return true;
1048 } 1048 }
1049 1049
1050 } // namespace blink 1050 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutPart.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698