Implement the new text-size-adjust CSS property

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * 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
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 27 matching lines @@
 #include "core/css/CSSPathValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSQuadValue.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSStringValue.h"
 #include "core/css/CSSURIValue.h"
 #include "core/css/CSSValuePair.h"
 #include "core/css/resolver/FilterOperationResolver.h"
 #include "core/frame/LocalFrame.h"
+#include "core/style/TextSizeAdjust.h"
 #include "core/svg/SVGURIReference.h"
 #include "platform/transforms/RotateTransformOperation.h"
 #include "platform/transforms/ScaleTransformOperation.h"
 #include "platform/transforms/TranslateTransformOperation.h"
 #include <algorithm>
 
 namespace blink {
 
 namespace {
 
@@ skipping 872 matching lines @@
 float StyleBuilderConverter::convertTextStrokeWidth(StyleResolverState& state, const CSSValue& value)
 {
     const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
     if (primitiveValue.getValueID()) {
         float multiplier = convertLineWidth<float>(state, value);
         return CSSPrimitiveValue::create(multiplier / 48, CSSPrimitiveValue::UnitType::Ems)->computeLength<float>(state.cssToLengthConversionData());
     }
     return primitiveValue.computeLength<float>(state.cssToLengthConversionData());
 }
 
+TextSizeAdjust StyleBuilderConverter::convertTextSizeAdjust(StyleResolverState& state, const CSSValue& value)
+{
+    if (value.isPrimitiveValue()) {

[Timothy Loh, 2016/06/28 00:50:25]

I'd probably write

const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.getValueID() == CSSValueNone)
    return TextSizeAdjust::adjustNone();
if (primitiveValue.getValueID() == CSSValueAuto)
    return TextSizeAdjust::adjustAuto();
DCHECK(primitiveValue.isPercentage());
return TextSizeAdjust(primitiveValue.getFloatValue() / 100.0f);

[pdr., 2016/06/28 16:38:57]

I wasn't sure this would work but it is better than mine where I was guarding
against non-percentage values unnecessarily. I've changed this to your
suggestion and added a test (TextAutosizerTest.TextSizeAdjustmentPixelUnits).

+        const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+
+        if (primitiveValue.getValueID() == CSSValueNone)
+            return TextSizeAdjust::adjustNone();
+
+        if (primitiveValue.isPercentage())
+            return TextSizeAdjust(primitiveValue.getFloatValue() / 100.0f);
+    }
+
+    return TextSizeAdjust::adjustAuto();
+}
+
 TransformOrigin StyleBuilderConverter::convertTransformOrigin(StyleResolverState& state, const CSSValue& value)
 {
     const CSSValueList& list = toCSSValueList(value);
     ASSERT(list.length() == 3);
 
     const CSSPrimitiveValue& primitiveValueX = toCSSPrimitiveValue(list.item(0));
     const CSSPrimitiveValue& primitiveValueY = toCSSPrimitiveValue(list.item(1));
     const CSSPrimitiveValue& primitiveValueZ = toCSSPrimitiveValue(list.item(2));
 
     return TransformOrigin(
@@ skipping 96 matching lines @@
 
 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverState& state, const CSSValue& value)
 {
     if (value.isPathValue())
         return toCSSPathValue(value).stylePath();
     ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueNone);
     return nullptr;
 }
 
 } // namespace blink