[css-grid] Improve intrinsic size computation with orthogonal flows

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 2179 matching lines @@
         cb->isLayoutBlockFlow()) {
       toLayoutBlockFlow(cb)->removeFloatingObjectsFromDescendants();
     }
   }
 }
 
 static bool prepareOrthogonalWritingModeRootForLayout(LayoutObject& root) {
   DCHECK(root.isBox() && toLayoutBox(root).isOrthogonalWritingModeRoot());
   if (!root.needsLayout() || root.isOutOfFlowPositioned() ||
       root.isColumnSpanAll() ||
-      !root.styleRef().logicalHeight().isIntrinsicOrAuto())
+      !root.styleRef().logicalHeight().isIntrinsicOrAuto() ||
+      toLayoutBox(root).isGridItem())
     return false;
 
   removeFloatingObjectsForSubtreeRoot(root);
   return true;
 }
 
 void FrameView::layoutOrthogonalWritingModeRoots() {
   for (auto& root : m_orthogonalWritingModeRootList.ordered()) {
     if (prepareOrthogonalWritingModeRootForLayout(*root))
       layoutFromRootObject(*root);
@@ skipping 3054 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink