[css-flexbox] Implementing new CSS Box Alignment values

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 1330 matching lines @@
                 break;
             }
             case ItemPositionFlexStart:
                 break;
             case ItemPositionFlexEnd:
                 adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
                 break;
             case ItemPositionCenter:
                 adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child) / 2);
                 break;
+            case ItemPositionLastBaseline: // TODO (lajava): This feature is at-risk of being dropped during the CR period.

[cbiesinger, 2015/08/10 20:45:46]

this is also not equivalent to baseline, is it? maybe add a FIXME comment for
now.

[jfernandez, 2015/08/11 13:52:59]

Yes, you are right. It's not equivalent, indeed. I'll keep the assert and just
add the TODO comment as you have suggested.

             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 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 paralell to container's inline-axis when column-flow is used.

[ikilpatrick, 2015/08/02 23:15:37]

s/paralell/parallel

& below.

[jfernandez, 2015/08/11 13:52:59]

Done.

+                if (isColumnFlow() && !style()->isLeftToRightDirection())
+                    adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
+                break;
+            case ItemPositionRight:
+                // Cross-axis is only paralell to container's inline-axis when column-flow is used.
+                if (isColumnFlow() && style()->isLeftToRightDirection())
+                    adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
+                break;
             case ItemPositionStart:
+                break;

[cbiesinger, 2015/08/10 20:45:46]

I don't think that's correct? start and flex-start are not necessarily the same,
right?

[jfernandez, 2015/08/11 13:52:59]

I think it's correct, but you are right when saying they are not necessarily the
same. The thing is that flex-start/end are switched based on the flex-wrap
value, which is not affecting start/end values. That logic is implemented in the
'alignmentForChild' function.

             case ItemPositionEnd:
-            case ItemPositionLeft:
-            case ItemPositionRight:
-                // FIXME: File a bug about implementing that. The extended grammar
-                // is not enabled by default so we shouldn't hit this codepath.
+                adjustAlignmentForChild(*child, availableAlignmentSpaceForChild(lineCrossAxisExtent, *child));
+                break;
+            default:
                 ASSERT_NOT_REACHED();
                 break;
             }
         }
         minMarginAfterBaselines.append(minMarginAfterBaseline);
     }
 
     if (style()->flexWrap() != FlexWrapReverse)
         return;
 
@@ skipping 74 matching lines @@
             ASSERT(child);
             LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisExtent;
             LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
             LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxisExtent;
             adjustAlignmentForChild(*child, newOffset - originalOffset);
         }
     }
 }
 
 }