Canvas objects did not mark themselves for layout when they're a flex item

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 458 matching lines @@
     // returning the max preferred height (=logical width)
     if (!child.isHorizontalWritingMode() && child.styleRef().height().isAuto())
         return child.maxPreferredLogicalWidth();
     return child.size().height();
 }
 
 LayoutUnit LayoutFlexibleBox::childIntrinsicWidth(const LayoutBox& child) const
 {
     if (!child.isHorizontalWritingMode() && needToStretchChildLogicalHeight(child))
         return constrainedChildIntrinsicContentLogicalHeight(child);
-    // TOOO(cbiesinger): should this return the maxPreferredLogicalWidth?
+    if (child.isHorizontalWritingMode() && child.styleRef().width().isAuto()) {
+        // This value is already clamped by min/max-width
+        return child.maxPreferredLogicalWidth();
+    }
     return child.size().width();
 }
 
 LayoutUnit LayoutFlexibleBox::crossAxisIntrinsicExtentForChild(const LayoutBox& child) const
 {
     return isHorizontalFlow() ? childIntrinsicHeight(child) : childIntrinsicWidth(child);
 }
 
 LayoutUnit LayoutFlexibleBox::mainAxisExtentForChild(const LayoutBox& child) const
 {
@@ skipping 335 matching lines @@
 
     Length flexBasis = flexBasisForChild(child);
     if (mainAxisLengthIsDefinite(child, flexBasis))
         return std::max(LayoutUnit(), computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis));
 
     LayoutUnit mainAxisExtent;
     if (childFlexBaseSizeRequiresLayout(child)) {
         if (childLayoutType == NeverLayout)
             return LayoutUnit();
 
-        if (child.needsLayout() || childLayoutType == ForceLayout || !m_intrinsicSizeAlongMainAxis.contains(&child)) {
+        if (1 || child.needsLayout() || childLayoutType == ForceLayout || !m_intrinsicSizeAlongMainAxis.contains(&child)) {

[eae, 2016/06/29 20:20:13]

You probably forgot to remove this...

[cbiesinger, 2016/06/29 20:36:51]

Yeah, included this entire file by accident :/

             child.forceChildLayout();
             cacheChildMainSize(child);
         }
         mainAxisExtent = m_intrinsicSizeAlongMainAxis.get(&child);
     } else {
         // We don't need to add scrollbarLogicalWidth here. For overflow: scroll, the preferred width
         // already includes the scrollbar size (via scrollbarLogicalWidth()). For overflow: auto,
         // childFlexBaseSizeRequiresLayout returns true and we handle that via the other branch
         // of this if.
         mainAxisExtent = child.maxPreferredLogicalWidth();
@@ skipping 1036 matching lines @@
             ASSERT(child);
             LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisExtent;
             LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
             LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxisExtent;
             adjustAlignmentForChild(*child, newOffset - originalOffset);
         }
     }
 }
 
 } // namespace blink