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

Side by Side Diff: Source/core/layout/line/InlineFlowBox.cpp

Issue 1119663002: Making Unicode character names consistent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Comment fixes Created 5 years, 7 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) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 LayoutUnit logicalRightMargin = isHorizontal() ? curr->boxModelO bject()->marginRight() : curr->boxModelObject()->marginBottom(); 433 LayoutUnit logicalRightMargin = isHorizontal() ? curr->boxModelO bject()->marginRight() : curr->boxModelObject()->marginBottom();
434 434
435 logicalLeft += logicalLeftMargin; 435 logicalLeft += logicalLeftMargin;
436 curr->setLogicalLeft(logicalLeft); 436 curr->setLogicalLeft(logicalLeft);
437 if (knownToHaveNoOverflow()) 437 if (knownToHaveNoOverflow())
438 minLogicalLeft = std::min(logicalLeft, minLogicalLeft); 438 minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
439 logicalLeft += curr->logicalWidth(); 439 logicalLeft += curr->logicalWidth();
440 if (knownToHaveNoOverflow()) 440 if (knownToHaveNoOverflow())
441 maxLogicalRight = std::max(logicalLeft, maxLogicalRight); 441 maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
442 logicalLeft += logicalRightMargin; 442 logicalLeft += logicalRightMargin;
443 // If we encounter any space after this inline block then ensure it is treated as the space between two words. 443 // If we encounter any spaceCharacter after this inline block th en ensure it is treated as the space between two words.
jsbell 2015/05/11 16:28:02 I believe this comment change is incorrect (but I'
h.joshi 2015/05/12 04:20:14 Done.
444 needsWordSpacing = true; 444 needsWordSpacing = true;
445 } 445 }
446 } 446 }
447 } 447 }
448 return logicalLeft; 448 return logicalLeft;
449 } 449 }
450 450
451 FontBaseline InlineFlowBox::dominantBaseline() const 451 FontBaseline InlineFlowBox::dominantBaseline() const
452 { 452 {
453 // Use "central" (Ideographic) baseline if writing-mode is vertical-* and te xt-orientation is not sideways-*. 453 // Use "central" (Ideographic) baseline if writing-mode is vertical-* and te xt-orientation is not sideways-*.
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
1310 ASSERT(child->prevOnLine() == prev); 1310 ASSERT(child->prevOnLine() == prev);
1311 prev = child; 1311 prev = child;
1312 } 1312 }
1313 ASSERT(prev == m_lastChild); 1313 ASSERT(prev == m_lastChild);
1314 #endif 1314 #endif
1315 } 1315 }
1316 1316
1317 #endif 1317 #endif
1318 1318
1319 } // namespace blink 1319 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698