Revert of text-combine should scale rather than fall back to none when wide

Source/core/rendering/line/LineBreaker.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 25 matching lines @@
             RenderBox* box = toRenderBox(object);
             setStaticPositions(m_block, box);
             bool originallyInline = box->style()->isOriginalDisplayInlineType();
             box->markStaticPositionedBoxForLayout(box->style()->isHorizontalWritingMode(), originallyInline);
             if (originallyInline) {
                 resolver.runs().addRun(createRun(0, 1, object, resolver));
                 lineInfo.incrementRunsFromLeadingWhitespace();
             }
         } else if (object->isFloating()) {
             m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
+        } else if (object->isText() && object->style()->hasTextCombine() && object->isCombineText() && !toRenderCombineText(object)->isCombined()) {
+            toRenderCombineText(object)->combineText();
+            if (toRenderCombineText(object)->isCombined())
+                continue;
         }
         resolver.position().increment(&resolver);
     }
     resolver.commitExplicitEmbedding(resolver.runs());
 }
 
 void LineBreaker::reset()
 {
     m_positionedObjects.clear();
     m_hyphenated = false;
@@ skipping 50 matching lines @@
 
         context.increment();
     }
 
     context.clearLineBreakIfFitsOnLine();
 
     return context.handleEndOfLine();
 }
 
 }