Fold 'rotate' attribute semantics into the attribute list iterator

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

 /*
  * Copyright (C) Research In Motion Limited 2010-2011. 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 157 matching lines @@
     STACK_ALLOCATED();
 public:
     AttributeListsIterator(SVGTextPositioningElement*);
 
     bool hasAttributes() const
     {
         return m_xListRemaining || m_yListRemaining
             || m_dxListRemaining || m_dyListRemaining
             || m_rotateListRemaining;
     }
-    void updateCharacterData(unsigned index, SVGCharacterData&);
-
-    bool hasRotation() const { return !SVGTextLayoutAttributes::isEmptyValue(m_lastRotation); }
-    float lastRotation() const { return m_lastRotation; }
-    unsigned rotateEnd() const { return m_rotateList->length(); }
+    void updateCharacterData(size_t index, SVGCharacterData&);
 
 private:
     SVGLengthContext m_lengthContext;
     Member<SVGLengthList> m_xList;
     unsigned m_xListRemaining;
     Member<SVGLengthList> m_yList;
     unsigned m_yListRemaining;
     Member<SVGLengthList> m_dxList;
     unsigned m_dxListRemaining;
     Member<SVGLengthList> m_dyList;
     unsigned m_dyListRemaining;
     Member<SVGNumberList> m_rotateList;
     unsigned m_rotateListRemaining;
-    float m_lastRotation;
 };
 
 AttributeListsIterator::AttributeListsIterator(SVGTextPositioningElement* element)
     : m_lengthContext(element)
     , m_xList(element->x()->currentValue())
     , m_xListRemaining(m_xList->length())
     , m_yList(element->y()->currentValue())
     , m_yListRemaining(m_yList->length())
     , m_dxList(element->dx()->currentValue())
     , m_dxListRemaining(m_dxList->length())
     , m_dyList(element->dy()->currentValue())
     , m_dyListRemaining(m_dyList->length())
     , m_rotateList(element->rotate()->currentValue())
     , m_rotateListRemaining(m_rotateList->length())
-    , m_lastRotation(SVGTextLayoutAttributes::emptyValue())
 {
 }
 
-inline void AttributeListsIterator::updateCharacterData(unsigned index, SVGCharacterData& data)
+inline void AttributeListsIterator::updateCharacterData(size_t index, SVGCharacterData& data)
 {
     if (m_xListRemaining) {
         data.x = m_xList->at(index)->value(m_lengthContext);
         --m_xListRemaining;
     }
     if (m_yListRemaining) {
         data.y = m_yList->at(index)->value(m_lengthContext);
         --m_yListRemaining;
     }
     if (m_dxListRemaining) {
         data.dx = m_dxList->at(index)->value(m_lengthContext);
         --m_dxListRemaining;
     }
     if (m_dyListRemaining) {
         data.dy = m_dyList->at(index)->value(m_lengthContext);
         --m_dyListRemaining;
     }
     if (m_rotateListRemaining) {
-        data.rotate = m_rotateList->at(index)->value();
-        m_lastRotation = data.rotate;
-        --m_rotateListRemaining;
+        data.rotate = m_rotateList->at(std::min(index, m_rotateList->length() - 1))->value();
+        // The last rotation value spans the whole scope.
+        if (m_rotateListRemaining > 1)
+            --m_rotateListRemaining;
     }
 }
 
 } // namespace
 
 void SVGTextLayoutAttributesBuilder::fillCharacterDataMap(const TextPosition& position)
 {
     AttributeListsIterator attrLists(position.element);
     for (unsigned i = 0; attrLists.hasAttributes() && i < position.length; ++i) {
         SVGCharacterData& data = m_characterDataMap.add(position.start + i + 1, SVGCharacterData()).storedValue->value;
         attrLists.updateCharacterData(i, data);
     }
-
-    if (!attrLists.hasRotation())
-        return;
-
-    // The last rotation value always spans the whole scope.
-    for (unsigned i = attrLists.rotateEnd(); i < position.length; ++i) {
-        SVGCharacterData& data = m_characterDataMap.add(position.start + i + 1, SVGCharacterData()).storedValue->value;
-        data.rotate = attrLists.lastRotation();
-    }
 }
 
 DEFINE_TRACE(SVGTextLayoutAttributesBuilder::TextPosition)
 {
     visitor->trace(element);
 }
 
 } // namespace blink