Merge 183104 "Force ComplexPath if any part of the node requires it"

Source/platform/fonts/Font.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2010, 2011 Apple 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 274 matching lines @@
 
     if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings()->size() > 0 && m_fontDescription.letterSpacing() == 0)
         return ComplexPath;
 
     if (m_fontDescription.widthVariant() != RegularWidth)
         return ComplexPath;
 
     if (run.length() > 1 && fontDescription().typesettingFeatures())
         return ComplexPath;
 
+    if (run.useComplexCodePath())
+        return ComplexPath;
+
     if (!run.characterScanForCodePath())
         return SimplePath;
 
     if (run.is8Bit())
         return SimplePath;
 
     // Start from 0 since drawing and highlighting also measure the characters before run->from.
     return Character::characterRangeCodePath(run.characters16(), run.length());
 }
 
@@ skipping 591 matching lines @@
                 if (delta <= 0)
                     break;
             }
         }
     }
 
     return offset;
 }
 
 } // namespace blink