Trace table cell position indicies accurately.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/TracedLayoutObject.h"
 
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/LayoutView.h"
@@ skipping 49 matching lines @@
     tracedValue->setBoolean("positioned", object.isOutOfFlowPositioned());
   if (object.selfNeedsLayout())
     tracedValue->setBoolean("selfNeeds", object.selfNeedsLayout());
   if (object.needsPositionedMovementLayout())
     tracedValue->setBoolean("positionedMovement",
                             object.needsPositionedMovementLayout());
   if (object.normalChildNeedsLayout())
     tracedValue->setBoolean("childNeeds", object.normalChildNeedsLayout());
   if (object.posChildNeedsLayout())
     tracedValue->setBoolean("posChildNeeds", object.posChildNeedsLayout());
+
   if (object.isTableCell()) {
-    const LayoutTableCell& c = toLayoutTableCell(object);
-    tracedValue->setDouble("row", c.rowIndex());
-    tracedValue->setDouble("col", c.absoluteColumnIndex());
-    if (c.rowSpan() != 1)
-      tracedValue->setDouble("rowSpan", c.rowSpan());
-    if (c.colSpan() != 1)
-      tracedValue->setDouble("colSpan", c.colSpan());
+    // Table layout might be dirty if traceGeometry is false.
+    // See https://crbug.com/664271 .
+    if (traceGeometry) {
+      const LayoutTableCell& c = toLayoutTableCell(object);
+      tracedValue->setDouble("row", c.rowIndex());
+      tracedValue->setDouble("col", c.absoluteColumnIndex());
+      if (c.rowSpan() != 1)
+        tracedValue->setDouble("rowSpan", c.rowSpan());
+      if (c.colSpan() != 1)
+        tracedValue->setDouble("colSpan", c.colSpan());
+    } else {
+      // At least indicate that object is a table cell.
+      tracedValue->setDouble("row", 0);
+      tracedValue->setDouble("col", 0);
+    }
   }
+
   if (object.isAnonymous())
     tracedValue->setBoolean("anonymous", object.isAnonymous());
   if (object.isRelPositioned())
     tracedValue->setBoolean("relativePositioned", object.isRelPositioned());
   if (object.isStickyPositioned())
     tracedValue->setBoolean("stickyPositioned", object.isStickyPositioned());
   if (object.isFloating())
     tracedValue->setBoolean("float", object.isFloating());
 
   if (object.slowFirstChild()) {
@@ skipping 11 matching lines @@
 }  // namespace
 
 std::unique_ptr<TracedValue> TracedLayoutObject::create(const LayoutView& view,
                                                         bool traceGeometry) {
   std::unique_ptr<TracedValue> tracedValue = TracedValue::create();
   dumpToTracedValue(view, traceGeometry, tracedValue.get());
   return tracedValue;
 }
 
 }  // namespace blink