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

> Force ComplexPath if any part of the node requires it
> 
> Change our font measurement/rendering logic to force the ComplexPath for
> the entire RenderText if any part of it requires it. This ensures
> consistency between preferred width and line break calculations.
> Also change FontCacheSkiaWin to use the subpixel settings from the
> primary font in case of character based fallback.
> 
> TEST=fast/text/international/complex-text-with-default-font-spaces.html
> BUG=412758
> [email protected]
> 
> Review URL: https://codereview.chromium.org/622653002

[email protected]

Review URL: https://codereview.chromium.org/616703004

git-svn-id: svn://svn.chromium.org/blink/branches/chromium/2171@183160 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Author: eaenet

Diff for: LayoutTests/NeverFixTests

@@ -135,6 +135,7 @@ fast/canvas/canvas-lost-gpu-context.html [ WontFix ]
 [ XP Mac ] fast/text/sub-pixel/text-scaling-rtl.html [ WontFix ]
 [ XP Mac ] fast/text/sub-pixel/text-scaling-vertical.html [ WontFix ]
 [ XP Mac ] fast/text/sub-pixel/text-scaling-webfont.html [ WontFix ]
+[ Mac ] fast/text/mixed-direction-bidi-wrap.html [ WontFix ]
 
 # We don't have full plane2 support on XP.
 [ XP ] fast/text/international/plane2.html [ WontFix ]

Diff for: LayoutTests/TestExpectations

@@ -749,6 +749,31 @@ crbug.com/352856 [ Mac ] svg/batik/text/xmlSpace.svg [ Failure Pass ]
 crbug.com/352856 [ Mac ] svg/batik/text/textPosition.svg [ Pass Failure NeedsManualRebaseline ]
 crbug.com/352856 [ Mac ] svg/batik/text/textPosition2.svg [ Pass Failure NeedsManualRebaseline ]
 
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/decorations-with-text-combine.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/text/decorations-with-text-combine.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] media/track/track-cue-rendering-vertical.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/justify-ideograph-complex.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/emphasis.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] svg/batik/text/verticalText.svg [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/text/justify-ideograph-complex.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/international/wrap-CJK-001.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/justify-ideograph-vertical.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/text/international/hindi-spacing.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/emphasis-vertical.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/text/emphasis-vertical.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/text/justify-ideograph-vertical.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/writing-mode/Kusa-Makura-background-canvas.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/international/hindi-spacing.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/text/emphasis.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/ruby/nested-ruby.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/text/international/wrap-CJK-001.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/forms/month/month-appearance-l10n.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] fast/forms/datetimelocal/datetimelocal-appearance-l10n.html [ NeedsRebaseline ]
+crbug.com/412758 [ Win ] svg/W3C-SVG-1.1/text-intro-04-t.svg [ Crash NeedsManualRebaseline ]
+crbug.com/412758 [ Win ] virtual/antialiasedtext/fast/text/justify-ideograph-simple.html [ NeedsRebaseline ]
+crbug.com/412758 [ Mac ] virtual/antialiasedtext/fast/text/emphasis-complex.html [ NeedsRebaseline ]
+crbug.com/412758 [ Mac ] fast/text/emphasis-complex.html [ NeedsRebaseline ]
+
 crbug.com/353186 [ Win Debug ] http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html [ Pass Timeout ]
 crbug.com/353208 fast/files/workers/worker-read-blob-async-crash.html [ Pass Crash Timeout ]
 crbug.com/353301 svg/custom/js-late-gradient-and-object-creation.svg [ Pass Failure ]
@@ -1288,7 +1313,7 @@ crbug.com/407993 [ Mac Win Release ] media/encrypted-media/encrypted-media-playb
 crbug.com/407993 [ Win Release ] media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html [ Timeout Pass ]
 crbug.com/407993 [ Win ] media/encrypted-media/prefixed/encrypted-media-events.html [ Crash Pass ]
 crbug.com/409579 http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-subframe.html [ Pass Timeout ]
-crbug.com/409715 [ Win ] svg/W3C-SVG-1.1/text-intro-04-t.svg [ Crash Pass ]
+#crbug.com/409715 [ Win ] svg/W3C-SVG-1.1/text-intro-04-t.svg [ Crash Pass ]
 crbug.com/409713 [ Linux Win Release ] fast/dom/Window/window-early-properties-xhr.html [ Pass Timeout ]
 crbug.com/409712 http/tests/filesystem/workers/resolve-url.html [ Pass Timeout ]
 crbug.com/409767 crypto/worker-subtle-crypto-concurrent.html [ Crash Pass Timeout ]

Diff for: LayoutTests/fast/text/international/complex-text-with-default-font-spaces-expected.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <style>
+            button {
+                font-family: Arial;
+                font-size: 12px;
+                white-space: nowrap;
+            }
+        </style>
+    </head>
+    <body>
+        <button>सभी को डिफ़ॉल्ट पर रीसेट करें</button>
+        <p>
+            The button above should not wrap.
+        </p>
+    </body>
+</html>

Diff for: LayoutTests/fast/text/international/complex-text-with-default-font-spaces.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <style>
+            button {
+                font-family: Arial;
+                font-size: 12px;
+            }
+        </style>
+    </head>
+    <body>
+        <button>सभी को डिफ़ॉल्ट पर रीसेट करें</button>
+        <p>
+            The button above should not wrap.
+        </p>
+    </body>
+</html>

Diff for: Source/core/rendering/RenderText.cpp

@@ -928,7 +928,6 @@ void RenderText::computePreferredLogicalWidths(float leadWidth, HashSet<const Si
 
     TextRun textRun(text());
     BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver;
-
     BidiCharacterRun* run;
     TextDirection textDirection = styleToUse->direction();
     if (isOverride(styleToUse->unicodeBidi())) {
@@ -1107,6 +1106,7 @@ void RenderText::computePreferredLogicalWidths(float leadWidth, HashSet<const Si
             } else {
                 TextRun run = constructTextRun(this, f, this, i, 1, styleToUse, textDirection);
                 run.setCharactersLength(len - i);
+                run.setUseComplexCodePath(!canUseSimpleFontCodePath());
                 ASSERT(run.charactersLength() >= run.length());
                 run.setTabSize(!style()->collapseWhiteSpace(), style()->tabSize());
                 run.setXPos(leadWidth + currMaxWidth);

Diff for: Source/core/rendering/line/BreakingContextInlineHeaders.h

@@ -521,6 +521,7 @@ ALWAYS_INLINE float textWidth(RenderText* text, unsigned from, unsigned len, con
 
     TextRun run = constructTextRun(text, font, text, from, len, text->style());
     run.setCharacterScanForCodePath(!text->canUseSimpleFontCodePath());
+    run.setUseComplexCodePath(!text->canUseSimpleFontCodePath());
     run.setTabSize(!collapseWhiteSpace, text->style()->tabSize());
     run.setXPos(xPos);
     return font.width(run, fallbackFonts, &glyphOverflow);

Diff for: Source/platform/fonts/Font.cpp

@@ -292,6 +292,9 @@ CodePath Font::codePath(const TextRun& run) const
     if (run.length() > 1 && fontDescription().typesettingFeatures())
         return ComplexPath;
 
+    if (run.useComplexCodePath())
+        return ComplexPath;
+
     if (!run.characterScanForCodePath())
         return SimplePath;
 

Diff for: Source/platform/fonts/win/FontCacheSkiaWin.cpp

@@ -76,7 +76,9 @@ FontCache::FontCache()
 
 // Given the desired base font, this will create a SimpleFontData for a specific
 // font that can be used to render the given range of characters.
-PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 character, const SimpleFontData*)
+PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
+    const FontDescription& fontDescription, UChar32 character,
+    const SimpleFontData* originalFontData)
 {
     // First try the specified font with standard style & weight.
     if (fontDescription.style() == FontStyleItalic
@@ -161,6 +163,15 @@ PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescrip
         data = getFontPlatformData(fontDescription, createByFamily);
     }
 
+    // For font fallback we want to match the subpixel behavior of the original
+    // font. Mixing subpixel and non-subpixel in the same text run looks really
+    // odd and causes problems with preferred width calculations.
+    if (data && originalFontData) {
+        const FontPlatformData& platformData = originalFontData->platformData();
+        data->setMinSizeForAntiAlias(platformData.minSizeForAntiAlias());
+        data->setMinSizeForSubpixel(platformData.minSizeForSubpixel());
+    }
+
     // When i-th font (0-base) in |panUniFonts| contains a character and
     // we get out of the loop, |i| will be |i + 1|. That is, if only the
     // last font in the array covers the character, |i| will be numFonts.

Diff for: Source/platform/text/TextRun.h

@@ -66,6 +66,7 @@ class PLATFORM_EXPORT TextRun {
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(false)
@@ -85,6 +86,7 @@ class PLATFORM_EXPORT TextRun {
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(false)
@@ -103,6 +105,7 @@ class PLATFORM_EXPORT TextRun {
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(normalizeSpace)
@@ -130,6 +133,7 @@ class PLATFORM_EXPORT TextRun {
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(normalizeSpace)
@@ -196,12 +200,14 @@ class PLATFORM_EXPORT TextRun {
     bool ltr() const { return m_direction == LTR; }
     bool directionalOverride() const { return m_directionalOverride; }
     bool characterScanForCodePath() const { return m_characterScanForCodePath; }
+    bool useComplexCodePath() const { return m_useComplexCodePath; }
     bool spacingDisabled() const { return m_disableSpacing; }
 
     void disableSpacing() { m_disableSpacing = true; }
     void setDirection(TextDirection direction) { m_direction = direction; }
     void setDirectionalOverride(bool override) { m_directionalOverride = override; }
     void setCharacterScanForCodePath(bool scan) { m_characterScanForCodePath = scan; }
+    void setUseComplexCodePath(bool useComplex) { m_useComplexCodePath = useComplex; }
 
     class RenderingContext : public RefCounted<RenderingContext> {
     public:
@@ -236,6 +242,7 @@ class PLATFORM_EXPORT TextRun {
     unsigned m_direction : 1;
     unsigned m_directionalOverride : 1; // Was this direction set by an override character.
     unsigned m_characterScanForCodePath : 1;
+    unsigned m_useComplexCodePath : 1;
     unsigned m_disableSpacing : 1;
     unsigned m_tabSize;
     bool m_normalizeSpace;