[css-flexbox] Implementing new CSS Box Alignment values

third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

 /*
  * Copyright (C) 2011 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 1400 matching lines @@
             case ItemPositionAuto:
                 ASSERT_NOT_REACHED();
                 break;
             case ItemPositionStretch: {
                 applyStretchAlignmentToChild(*child, lineCrossAxisExtent);
                 // Since wrap-reverse flips cross start and cross end, strech children should be aligned with the cross end.
                 if (style()->flexWrap() == FlexWrapReverse)
                     adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
                 break;
             }
+            case ItemPositionStart:
             case ItemPositionFlexStart:
+                // We treat flex-start the same as start because alignmentForChild fixed
+                // it up appropriately
                 break;
+            case ItemPositionEnd:
             case ItemPositionFlexEnd:
+                // We treat flex-end the same as end because alignmentForChild fixed
+                // it up appropriately
                 adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
                 break;
             case ItemPositionCenter:
                 adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child) / 2);
                 break;
             case ItemPositionBaseline: {
                 // FIXME: If we get here in columns, we want the use the descent, except we currently can't get the ascent/descent of orthogonal children.
                 // https://bugs.webkit.org/show_bug.cgi?id=98076
                 LayoutUnit ascent = marginBoxAscentForChild(*child);
                 LayoutUnit startOffset = maxAscent - ascent;
                 adjustAlignmentForChild(*child, startOffset);
 
                 if (style()->flexWrap() == FlexWrapReverse)
                     minMarginAfterBaseline = std::min(minMarginAfterBaseline, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child) - startOffset);
                 break;
             }
-            case ItemPositionLastBaseline:
-            case ItemPositionSelfStart:
-            case ItemPositionSelfEnd:
-            case ItemPositionStart:
-            case ItemPositionEnd:
+            case ItemPositionSelfStart: {
+                bool hasSameCrossStartEdges = hasOrthogonalFlow(*child) ? child->styleRef().isLeftToRightDirection() == styleRef().isLeftToRightDirection() : child->styleRef().isFlippedBlocksWritingMode() == styleRef().isFlippedBlocksWritingMode();
+                if (!hasSameCrossStartEdges)
+                    adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
+                break;
+            }
+            case ItemPositionSelfEnd: {
+                bool hasSameCrossStartEdges = hasOrthogonalFlow(*child) ? child->styleRef().isLeftToRightDirection() == styleRef().isLeftToRightDirection() : child->styleRef().isFlippedBlocksWritingMode() == styleRef().isFlippedBlocksWritingMode();
+                if (hasSameCrossStartEdges)
+                    adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
+                break;
+            }
             case ItemPositionLeft:
+                // Cross-axis is only parallel to container's inline-axis when column-flow is used.
+                if (isColumnFlow() && !style()->isLeftToRightDirection())

[cbiesinger, 2015/12/01 00:12:49]

is that true? shouldn't it be if (!isHorizontalFlow() && ...) ?

same for right

+                    adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
+                break;
             case ItemPositionRight:
-                // FIXME: Implement these (https://crbug.com/507690). The extended grammar
-                // is not enabled by default so we shouldn't hit this codepath.
+                // Cross-axis is only parallel to container's inline-axis when column-flow is used.
+                if (isColumnFlow() && style()->isLeftToRightDirection())
+                    adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
+                break;
+            case ItemPositionLastBaseline: // TODO (lajava): This feature is at-risk of being dropped during the CR period.

[cbiesinger, 2015/12/01 00:12:49]

if we're still parsing it, it seems better not to have an assert_not_reached
here

+            default:
                 ASSERT_NOT_REACHED();
                 break;
             }
         }
         minMarginAfterBaselines.append(minMarginAfterBaseline);
     }
 
     if (style()->flexWrap() != FlexWrapReverse)
         return;
 
@@ skipping 68 matching lines @@
             ASSERT(child);
             LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisExtent;
             LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
             LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxisExtent;
             adjustAlignmentForChild(*child, newOffset - originalOffset);
         }
     }
 }
 
 }