Create an autosizing layout scope in RenderGrid.

BUG=341119 Review URL: https://codereview.chromium.org/324183002 git-svn-id: svn://svn.chromium.org/blink/trunk@176056 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Create an autosizing layout scope in RenderGrid.
BUG=341119 Review URL: https://codereview.chromium.org/324183002 git-svn-id: svn://svn.chromium.org/blink/trunk@176056 bbb929c8-8fbe-4397-9dbb-9b2b20218538
6cc5b6a3 · skobes@chromium.org · dd6e32f2 · 6cc5b6a3 · 6cc5b6a3 · 6cc5b6a3
Commit 6cc5b6a3 authored Jun 12, 2014 by skobes@chromium.org
3 changed files
--- a/third_party/WebKit/LayoutTests/fast/text-autosizing/grid-dbcat-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/text-autosizing/grid-dbcat-expected.txt
+This tests that RenderGrid creates an autosizing layout scope. The test passes if it does not crash.
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
--- a/third_party/WebKit/LayoutTests/fast/text-autosizing/grid-dbcat.html
+++ b/third_party/WebKit/LayoutTests/fast/text-autosizing/grid-dbcat.html
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=800">
+<style>
+  html { font-size: 16px; }
+  body { width: 800px; margin: 0; overflow-y: hidden; }
+</style>
+<script src="resources/autosizingTest.js"></script>
+</head>
+<body>
+<div style="display: grid">
+  <div>
+    This tests that RenderGrid creates an autosizing layout scope.
+    The test passes if it does not crash.
+  </div>
+  <div>
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+  </div>
+</div>
+<script>
+  if (window.testRunner)
+    testRunner.dumpAsText();
+</script>
+</body>
+</html>
--- a/third_party/WebKit/Source/core/rendering/RenderGrid.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderGrid.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "core/rendering/RenderGrid.h"

+#include "core/rendering/FastTextAutosizer.h"
 #include "core/rendering/LayoutRepainter.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderView.h"
@@ -304,6 +305,8 @@ void RenderGrid::layoutBlock(bool relayoutChildren)
    setLogicalHeight(0);
    updateLogicalWidth();

+    FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
+
    layoutGridItems();

    LayoutUnit oldClientAfterEdge = clientLogicalBottom();