[Alignment] Single class for holding the alignment data.

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 10 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/resolver/StyleBuilderConverter.h"
 
 #include "core/css/BasicShapeFunctions.h"
+#include "core/css/CSSContentDistributionValue.h"
 #include "core/css/CSSFontFeatureValue.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSGridLineNamesValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/Pair.h"
 #include "core/css/Rect.h"
 #include "core/svg/SVGElement.h"
 #include "core/svg/SVGURIReference.h"
@@ skipping 283 matching lines @@
 
     if (angle <= 45.0f || angle > 315.0f)
         return GO_0DEG;
     if (angle > 45.0f && angle <= 135.0f)
         return GO_90DEG;
     if (angle > 135.0f && angle <= 225.0f)
         return GO_180DEG;
     return GO_270DEG;
 }
 
+StyleAlignmentData StyleBuilderConverter::convertSelfAlignmentData(StyleResolverState&, CSSValue* value)
+{
+    ItemPosition position = ItemPositionAuto;
+    OverflowAlignment overflow = OverflowAlignmentDefault;
+    ItemPositionType positionType = NonLegacyPosition;

[Julien - ping for review, 2015/04/13 14:46:20]

This is subtly duplicating the logic from the initial function on ComputedStyle.
I would be more comfortable using one of them here instead.

If that means having 6 functions that call back into these 2 ones so that we use
the right initial values, that's an improvement in my book.

[jfernandez, 2015/04/14 00:18:42]

Done.

+
+    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
+    if (Pair* pairValue = primitiveValue->getPairValue()) {
+        if (pairValue->first()->getValueID() == CSSValueLegacy) {
+            positionType = LegacyPosition;
+            position = *pairValue->second();
+        } else {
+            position = *pairValue->first();
+            overflow = *pairValue->second();
+        }
+    } else {
+        position = *primitiveValue;
+    }
+
+    return StyleAlignmentData(position, overflow, positionType);
+}
+
+StyleAlignmentData StyleBuilderConverter::convertContentAlignmentData(StyleResolverState&, CSSValue* value)
+{
+    ContentPosition position = ContentPositionAuto;
+    ContentDistributionType distribution = ContentDistributionDefault;
+    OverflowAlignment overflow = OverflowAlignmentDefault;

[Julien - ping for review, 2015/04/13 14:46:20]

Same comment.

[jfernandez, 2015/04/14 00:18:42]

Done.

+
+    CSSContentDistributionValue* contentValue = toCSSContentDistributionValue(value);
+    if (contentValue->distribution()->getValueID() != CSSValueInvalid)
+        distribution = *contentValue->distribution();
+    if (contentValue->position()->getValueID() != CSSValueInvalid)
+        position = *contentValue->position();
+    if (contentValue->overflow()->getValueID() != CSSValueInvalid)
+        overflow = *contentValue->overflow();
+
+    return StyleAlignmentData(position, distribution, overflow);
+}
+
 GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, CSSValue* value)
 {
     CSSValueList* list = toCSSValueList(value);
 
     ASSERT(list->length() >= 1);
     CSSPrimitiveValue* first = toCSSPrimitiveValue(list->item(0));
     CSSPrimitiveValue* second = list->length() == 2 ? toCSSPrimitiveValue(list->item(1)) : nullptr;
 
     switch (first->getValueID()) {
     case CSSValueRow:
@@ skipping 528 matching lines @@
     CSSPrimitiveValue* primitiveValueZ = toCSSPrimitiveValue(list->item(2));
 
     return TransformOrigin(
         convertOriginLength<CSSValueLeft, CSSValueRight>(state, primitiveValueX),
         convertOriginLength<CSSValueTop, CSSValueBottom>(state, primitiveValueY),
         StyleBuilderConverter::convertComputedLength<float>(state, primitiveValueZ)
     );
 }
 
 } // namespace blink