Prioritize hyphenations over break-word/break-all

third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
  *               All right reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 1083 matching lines @@
     if (!m_appliedStartWidth) {
       m_width.addUncommittedWidth(
           inlineLogicalWidthFromAncestorsIfNeeded(m_current.getLineLayoutItem(),
                                                   true, false)
               .toFloat());
       m_appliedStartWidth = true;
     }
 
     midWordBreak = false;
     if (!m_width.fitsOnLine()) {
-      if (canBreakMidWord) {
-        m_width.addUncommittedWidth(-wordMeasurement.width);
-        if (rewindToMidWordBreak(layoutText, style, font, breakAll,
-                                 wordMeasurement)) {
-          lastWidthMeasurement = wordMeasurement.width + lastSpaceWordSpacing;
-          midWordBreak = true;
-        }
-        m_width.addUncommittedWidth(wordMeasurement.width);
-      } else if (hyphenation &&
-                 (m_nextObject || isLineEmpty ||
-                  !layoutText.containsOnlyWhitespace(
-                      m_current.offset(),
-                      layoutText.textLength() - m_current.offset()))) {
+      if (hyphenation && (m_nextObject || isLineEmpty ||

[eae, 2016/12/07 07:16:20]

This is pretty hard to read, how about adding a static helper function?

+                          !layoutText.containsOnlyWhitespace(
+                              m_current.offset(),
+                              layoutText.textLength() - m_current.offset()))) {
         m_width.addUncommittedWidth(-wordMeasurement.width);
         DCHECK(lastSpace == static_cast<unsigned>(wordMeasurement.startOffset));
         DCHECK(m_current.offset() ==
                static_cast<unsigned>(wordMeasurement.endOffset));
         if (hyphenate(layoutText, style, font, *hyphenation,
                       lastSpaceWordSpacing, wordMeasurement)) {
           m_width.addUncommittedWidth(wordMeasurement.width);
           hyphenated = true;
           m_atEnd = true;
           return false;
         }
         m_width.addUncommittedWidth(wordMeasurement.width);
       }
+      if (canBreakMidWord) {
+        m_width.addUncommittedWidth(-wordMeasurement.width);
+        if (rewindToMidWordBreak(layoutText, style, font, breakAll,
+                                 wordMeasurement)) {
+          lastWidthMeasurement = wordMeasurement.width + lastSpaceWordSpacing;
+          midWordBreak = true;
+        }
+        m_width.addUncommittedWidth(wordMeasurement.width);
+      }
     }
 
     // If we haven't hit a breakable position yet and already don't fit on the
     // line try to move below any floats.
     if (!m_width.committedWidth() && m_autoWrap && !m_width.fitsOnLine() &&
         !widthMeasurementAtLastBreakOpportunity) {
       float availableWidthBefore = m_width.availableWidth();
       m_width.fitBelowFloats(m_lineInfo.isFirstLine());
       // If availableWidth changes by moving the line below floats, needs to
       // measure midWordBreak again.
@@ skipping 70 matching lines @@
                                                        secondToLastCharacter);
 
   wordMeasurements.grow(wordMeasurements.size() + 1);
   WordMeasurement& wordMeasurement = wordMeasurements.back();
   wordMeasurement.layoutText = layoutText;
 
   // IMPORTANT: current.offset() is > layoutText.textLength() here!
   float lastWidthMeasurement = 0;
   wordMeasurement.startOffset = lastSpace;
   wordMeasurement.endOffset = m_current.offset();
-  midWordBreak = false;
   if (!m_ignoringSpaces) {
     lastWidthMeasurement =
         textWidth(layoutText, lastSpace, m_current.offset() - lastSpace, font,
                   m_width.currentWidth(), m_collapseWhiteSpace,
                   &wordMeasurement.fallbackFonts, &wordMeasurement.glyphBounds);
     wordMeasurement.width =
         lastWidthMeasurement + wordSpacingForWordMeasurement;
     wordMeasurement.glyphBounds.move(wordSpacingForWordMeasurement, 0);
-
-    if (canBreakMidWord && !m_width.fitsOnLine(lastWidthMeasurement) &&
-        rewindToMidWordBreak(layoutText, style, font, breakAll,
-                             wordMeasurement)) {
-      lastWidthMeasurement = wordMeasurement.width;
-      midWordBreak = true;
-    }
   }
   lastWidthMeasurement += lastSpaceWordSpacing;
 
   LayoutUnit additionalWidthFromAncestors =
       inlineLogicalWidthFromAncestorsIfNeeded(m_current.getLineLayoutItem(),
                                               !m_appliedStartWidth,
                                               m_includeEndWidth);
   m_width.addUncommittedWidth(lastWidthMeasurement +
                               additionalWidthFromAncestors);
 
   if (m_collapseWhiteSpace && m_currentCharacterIsSpace && lastWidthMeasurement)
     m_width.setTrailingWhitespaceWidth(lastWidthMeasurement +
                                        additionalWidthFromAncestors);
 
   m_includeEndWidth = false;
 
-  if (midWordBreak) {
-    m_width.commit();
-    m_atEnd = true;
-  } else if (!m_width.fitsOnLine()) {
+  if (!m_ignoringSpaces && !m_width.fitsOnLine()) {
     if (hyphenation && (m_nextObject || isLineEmpty)) {
       m_width.addUncommittedWidth(-wordMeasurement.width);
-      DCHECK(lastSpace == static_cast<unsigned>(wordMeasurement.startOffset));
-      DCHECK(m_current.offset() ==
-             static_cast<unsigned>(wordMeasurement.endOffset));
+      DCHECK_EQ(lastSpace, static_cast<unsigned>(wordMeasurement.startOffset));
+      DCHECK_EQ(m_current.offset(),
+                static_cast<unsigned>(wordMeasurement.endOffset));
       if (hyphenate(layoutText, style, font, *hyphenation, lastSpaceWordSpacing,
                     wordMeasurement)) {
         hyphenated = true;
         m_atEnd = true;
       }
       m_width.addUncommittedWidth(wordMeasurement.width);
     }
     if (!hyphenated && isBreakAtSoftHyphen() && !disableSoftHyphen) {
       hyphenated = true;
       m_atEnd = true;
-    } else if (!m_ignoringSpaces && canBreakMidWord &&
-               m_width.committedWidth()) {
-      m_atEnd = true;
+    }
+    if (!hyphenated && canBreakMidWord) {
+      m_width.addUncommittedWidth(-wordMeasurement.width);
+      if (rewindToMidWordBreak(layoutText, style, font, breakAll,
+                               wordMeasurement)) {
+        m_width.addUncommittedWidth(wordMeasurement.width);
+        m_width.commit();
+        m_atEnd = true;
+      } else {
+        m_width.addUncommittedWidth(wordMeasurement.width);
+        if (m_width.committedWidth())
+          m_atEnd = true;
+      }
     }
   }
   return false;
 }
 
 inline void BreakingContext::prepareForNextCharacter(
     const LineLayoutText& layoutText,
     bool& prohibitBreakInside,
     bool previousCharacterIsSpace) {
   if (layoutText.isSVGInlineText() && m_current.offset()) {
@@ skipping 249 matching lines @@
 
   if (style.getTextIndentType() == TextIndentHanging)
     indentText = indentText == IndentText ? DoNotIndentText : IndentText;
 
   return indentText;
 }
 
 }  // namespace blink
 
 #endif  // BreakingContextInlineHeaders_h