Fix when there are justification opportunities inside text-combine-upright

third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.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 41 matching lines @@
     : m_totalOpportunities(0)
     { }
 
     void addRunWithExpansions(BidiRun& run, bool& isAfterExpansion, TextJustify textJustify)
     {
         LineLayoutText text = LineLayoutText(run.m_lineLayoutItem);
         unsigned opportunitiesInRun;
         if (text.is8Bit()) {
             opportunitiesInRun = Character::expansionOpportunityCount(text.characters8() + run.m_start,
                 run.m_stop - run.m_start, run.m_box->direction(), isAfterExpansion, textJustify);
+        } else if (run.m_lineLayoutItem.isCombineText()) {
+            // Justfication applies to before and after the combined text as if
+            // it is an ideographic character, and is prohibited inside the
+            // combined text.
+            opportunitiesInRun = isAfterExpansion ? 1 : 2;
+            isAfterExpansion = true;
         } else {
             opportunitiesInRun = Character::expansionOpportunityCount(text.characters16() + run.m_start,
                 run.m_stop - run.m_start, run.m_box->direction(), isAfterExpansion, textJustify);
         }
         m_runsWithExpansions.append(opportunitiesInRun);
         m_totalOpportunities += opportunitiesInRun;
     }
     void removeTrailingExpansion()
     {
         if (!m_totalOpportunities || !m_runsWithExpansions.last())
@@ skipping 2001 matching lines @@
 
 PaintInvalidationReason LayoutBlockFlow::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
 {
     if (containsFloats())
         paintInvalidationState.paintingLayer().setNeedsPaintPhaseFloat();
 
     return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 } // namespace blink