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

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

 /*
  * Copyright (C) 2004, 2006, 2007 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 39 matching lines @@
 void LayoutHTMLCanvas::paintReplaced(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     HTMLCanvasPainter(*this).paintReplaced(paintInfo, paintOffset);
 }
 
 void LayoutHTMLCanvas::canvasSizeChanged()
 {
     IntSize canvasSize = toHTMLCanvasElement(node())->size();
     LayoutSize zoomedSize(canvasSize.width() * style()->effectiveZoom(), canvasSize.height() * style()->effectiveZoom());
 
-    if (zoomedSize == intrinsicSize())
+    if (zoomedSize == intrinsicSize()) {

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

Please either revert this style only change or change all the if statements in
the method.

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

Ah, oops, that was an accidental leftover.

         return;
+    }
 
     setIntrinsicSize(zoomedSize);
 
-    if (!parent())
+    if (!parent()) {
         return;
+    }
 
     if (!preferredLogicalWidthsDirty())
         setPreferredLogicalWidthsDirty();
 
     LayoutSize oldSize = size();
     updateLogicalWidth();
     updateLogicalHeight();
-    if (oldSize == size())
+    if (oldSize == size() && !hasOverrideLogicalContentWidth() && !hasOverrideLogicalContentHeight()) {
+        // If we have an override size, then we're probably a flex item, and the

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

Nice comment!

+        // check above is insufficient because updateLogical{Width,Height} just
+        // used the override size. We actually have to mark ourselves as needing
+        // layout so the flex algorithm can run and compute our size correctly.
         return;
+    }
 
     if (!selfNeedsLayout())
         setNeedsLayout(LayoutInvalidationReason::SizeChanged);
 }
 
 PaintInvalidationReason LayoutHTMLCanvas::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
 {
     PaintInvalidationReason reason = LayoutBox::invalidatePaintIfNeeded(paintInvalidationState);
     HTMLCanvasElement* element = toHTMLCanvasElement(node());
     if (element->isDirty()) {
@@ skipping 11 matching lines @@
     return CompositingReasonNone;
 }
 
 void LayoutHTMLCanvas::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
     LayoutReplaced::styleDidChange(diff, oldStyle);
     toHTMLCanvasElement(node())->styleDidChange(oldStyle, styleRef());
 }
 
 } // namespace blink