Move isEmptyValue and emptyValue to SVGCharacterData

third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010-2012. 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 36 matching lines @@
     , m_textPathSpacing(0)
     , m_textPathScaling(1)
 {
     ASSERT(!m_layoutAttributes.isEmpty());
 }
 
 SVGTextLayoutEngine::~SVGTextLayoutEngine() = default;
 
 bool SVGTextLayoutEngine::setCurrentTextPosition(const SVGCharacterData& data)
 {
-    bool hasX = !SVGTextLayoutAttributes::isEmptyValue(data.x);
+    bool hasX = data.hasX();
     if (hasX)
         m_textPosition.setX(data.x);
 
-    bool hasY = !SVGTextLayoutAttributes::isEmptyValue(data.y);
+    bool hasY = data.hasY();
     if (hasY)
         m_textPosition.setY(data.y);
 
     // If there's an absolute x/y position available, it marks the beginning of
     // a new position along the path.
     if (m_inPathLayout) {
         // TODO(fs): If a new chunk (== absolute position) is defined while in
         // path layout mode, alignment should be based on that chunk and not
         // the path as a whole. (Re: the addition of m_textPathStartOffset
         // below.)
@@ skipping 14 matching lines @@
     // here, but that requires a bit more untangling yet.
     if (m_isVerticalText)
         m_textPosition.setY(m_textPosition.y() + glyphAdvance);
     else
         m_textPosition.setX(m_textPosition.x() + glyphAdvance);
 }
 
 bool SVGTextLayoutEngine::applyRelativePositionAdjustmentsIfNeeded(const SVGCharacterData& data)
 {
     FloatPoint delta;
-    bool hasDx = !SVGTextLayoutAttributes::isEmptyValue(data.dx);
+    bool hasDx = data.hasDx();
     if (hasDx)
         delta.setX(data.dx);
 
-    bool hasDy = !SVGTextLayoutAttributes::isEmptyValue(data.dy);
+    bool hasDy = data.hasDy();
     if (hasDy)
         delta.setY(data.dy);
 
     // Apply dx/dy value adjustments to current text position, if needed.
     m_textPosition.moveBy(delta);
 
     if (m_inPathLayout) {
         if (m_isVerticalText)
             delta = delta.transposedPoint();
 
@@ skipping 331 matching lines @@
             m_textPosition = position;
 
             // For vertical text on path, the actual angle has to be rotated 90 degrees anti-clockwise, not the orientation angle!
             if (m_isVerticalText)
                 angle -= 90;
         } else {
             position = m_textPosition;
             position += baselineShift;
         }
 
-        if (!SVGTextLayoutAttributes::isEmptyValue(data.rotate))
+        if (data.hasRotate())
             angle += data.rotate;
 
         // Determine whether we have to start a new fragment.
         bool shouldStartNewFragment = needsFragmentPerGlyph || hasRelativePosition
             || angle || angle != lastAngle || applySpacingToNextCharacter;
 
         // If we already started a fragment, close it now.
         if (didStartTextFragment && shouldStartNewFragment) {
             applySpacingToNextCharacter = false;
             recordTextFragment(textBox);
@@ skipping 41 matching lines @@
     }
 
     if (!didStartTextFragment)
         return;
 
     // Close last open fragment, if needed.
     recordTextFragment(textBox);
 }
 
 } // namespace blink