[Linux] Enable subpixel text on high-dpi regardless of hinting

Source/platform/fonts/linux/FontPlatformDataLinux.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "public/platform/Platform.h"
 
 #include "SkTypeface.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h"
+#include "platform/graphics/GraphicsContext.h"
 #include "public/platform/linux/WebFontInfo.h"
 #include "public/platform/linux/WebFontRenderStyle.h"
 #include "public/platform/linux/WebSandboxSupport.h"
 
 namespace WebCore {
 
 static SkPaint::Hinting skiaHinting = SkPaint::kNormal_Hinting;
 static bool useSkiaAutoHint = true;
 static bool useSkiaBitmaps = true;
 static bool useSkiaAntiAlias = true;
@@ skipping 17 matching lines @@
 void FontPlatformData::setAntiAlias(bool useAntiAlias)
 {
     useSkiaAntiAlias = useAntiAlias;
 }
 
 void FontPlatformData::setSubpixelRendering(bool useSubpixelRendering)
 {
     useSkiaSubpixelRendering = useSubpixelRendering;
 }
 
-void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext*) const
+void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext* context)
+    const
 {
     paint->setAntiAlias(m_style.useAntiAlias);
     paint->setHinting(static_cast<SkPaint::Hinting>(m_style.hintStyle));
     paint->setEmbeddedBitmapText(m_style.useBitmaps);
     paint->setAutohinted(m_style.useAutoHint);
     if (m_style.useAntiAlias)
         paint->setLCDRenderText(m_style.useSubpixelRendering);
 
+    // Do not enable subpixel text on low-dpi if full hinting is requested.
+    bool useSubpixelText = RuntimeEnabledFeatures::subpixelFontScalingEnabled()
+        && context && (paint->getHinting() != SkPaint::kFull_Hinting
+            || context->deviceScaleFactor() > 1.0f);
+
     // TestRunner specifically toggles the subpixel positioning flag.
-    if (RuntimeEnabledFeatures::subpixelFontScalingEnabled()
-        && paint->getHinting() != SkPaint::kFull_Hinting
-        && !LayoutTestSupport::isRunningLayoutTest())
+    if (useSubpixelText && !LayoutTestSupport::isRunningLayoutTest())
         paint->setSubpixelText(true);
     else
         paint->setSubpixelText(m_style.useSubpixelPositioning);
 
     const float ts = m_textSize >= 0 ? m_textSize : 12;
     paint->setTextSize(SkFloatToScalar(ts));
     paint->setTypeface(m_typeface.get());
     paint->setFakeBoldText(m_syntheticBold);
     paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
 }
@@ skipping 44 matching lines @@
         || LayoutTestSupport::isRunningLayoutTest())
         m_style.useSubpixelPositioning = useSkiaSubpixelPositioning;
 }
 
 bool FontPlatformData::defaultUseSubpixelPositioning()
 {
     return FontDescription::subpixelPositioning();
 }
 
 } // namespace WebCore