Fix trailing space handling for complex text

Source/core/rendering/RenderBlockLineLayout.cpp

 /*
  * 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.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 1149 matching lines @@
             child->borderEnd();
     }
     return getBPMWidth(child->marginStart(), childStyle->marginStart()) +
         getBPMWidth(child->paddingStart(), childStyle->paddingStart()) +
         child->borderStart();
 }
 
 static inline void stripTrailingSpace(float& inlineMax, float& inlineMin, RenderObject* trailingSpaceChild)
 {
     if (trailingSpaceChild && trailingSpaceChild->isText()) {
+        bool useComplexCodePath = !toRenderText(trailingSpaceChild)->

[pdr., 2014/10/14 23:56:59]

Can you move this below and use the (poorly-named) 't' RenderText?

+            canUseSimpleFontCodePath();

[chrishtr, 2014/10/14 23:50:09]

Nit: make this one line.

[eae, 2014/10/15 00:30:37]

96 characters seems rather long for a single line, especially since most of the
surrounding code is wrapped at between 80 and 90.

         // Collapse away the trailing space at the end of a block.
         RenderText* t = toRenderText(trailingSpaceChild);
         const UChar space = ' ';
         const Font& font = t->style()->font(); // FIXME: This ignores first-line.
-        float spaceWidth = font.width(constructTextRun(t, font, &space, 1, t->style(), LTR));
+        TextRun run = constructTextRun(t, font, &space, 1, t->style(), LTR);
+        if (useComplexCodePath)

[pdr., 2014/10/14 23:21:20]

Why doesn't constructTextRun handle setting whether it uses the complex code
path or not?

+            run.setUseComplexCodePath(true);
+        float spaceWidth = font.width(run);
         inlineMax -= spaceWidth + font.fontDescription().wordSpacing();
         if (inlineMin > inlineMax)
             inlineMin = inlineMax;
     }
 }
 
 static inline void updatePreferredWidth(LayoutUnit& preferredWidth, float& result)
 {
     LayoutUnit snappedResult = LayoutUnit::fromFloatCeil(result);
     preferredWidth = std::max(snappedResult, preferredWidth);
@@ skipping 857 matching lines @@
     float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat();
     float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), false) - logicalLeft;
     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWidth, availableLogicalWidth, 0);
 
     if (!style()->isLeftToRightDirection())
         return logicalWidth() - logicalLeft;
     return logicalLeft;
 }
 
 }