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

Unified Diff: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
index e329fe305bb462f196fbec2da629da6641911711..96f3e98659ba474efc00ae9d185f984fda2bf687 100644
--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
@@ -1113,8 +1113,9 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements,
midWordBreak = false;
if (!m_width.fitsOnLine()) {
- if (hyphenation && (m_nextObject || isLineEmpty ||
- hasVisibleText(layoutText, m_current.offset()))) {
+ if (hyphenation &&
+ (m_nextObject || isLineEmpty ||
+ hasVisibleText(layoutText, m_current.offset()))) {
m_width.addUncommittedWidth(-wordMeasurement.width);
DCHECK(lastSpace == static_cast<unsigned>(wordMeasurement.startOffset));
DCHECK(m_current.offset() ==
@@ -1410,9 +1411,10 @@ inline bool BreakingContext::canBreakAtWhitespace(
// If we break only after white-space, consider the current character
// as candidate width for this line.
- if (midWordBreak || trailingSpaceExceedsAvailableWidth(
- canBreakMidWord, layoutText, wordMeasurement,
- applyWordSpacing, wordSpacing, font) ||
+ if (midWordBreak ||
+ trailingSpaceExceedsAvailableWidth(canBreakMidWord, layoutText,
+ wordMeasurement, applyWordSpacing,
+ wordSpacing, font) ||
!m_width.fitsOnLine()) {
if (m_lineBreak.atTextParagraphSeparator()) {
if (!stoppedIgnoringSpaces && m_current.offset() > 0)

Powered by Google App Engine
This is Rietveld 408576698