Account for perspective and preserve-3d in mapToVisualRectInAncestorSpace

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 1175 matching lines @@
     }
     if (!rects.isEmpty()) {
       LayoutRect outlineRect = unionRectEvenIfEmpty(rects);
       outlineRect.inflate(outlineOutset);
       overflowRect.unite(outlineRect);
     }
   }
   return overflowRect;
 }
 
-bool LayoutInline::mapToVisualRectInAncestorSpace(
+bool LayoutInline::mapToVisualRectInAncestorSpaceInternal(
     const LayoutBoxModelObject* ancestor,
-    LayoutRect& rect,
+    TransformState& transformState,
     VisualRectFlags visualRectFlags) const {
   if (ancestor == this)
     return true;
 
   LayoutObject* container = this->container();
   ASSERT(container == parent());
   if (!container)
     return true;
 
+  bool preserve3D =
+      (container->style()->preserves3D() && !container->isText()) ||
+      (style()->preserves3D() && !isText());

[Xianzhu, 2017/03/03 01:24:42]

Ditto about !isText().

[chrishtr, 2017/03/03 02:45:11]

Done.

+
+  TransformState::TransformAccumulation accumulation =
+      preserve3D ? TransformState::AccumulateTransform
+                 : TransformState::FlattenTransform;
+
   if (style()->hasInFlowPosition() && layer()) {
     // Apply the in-flow position offset when invalidating a rectangle. The
     // layer is translated, but the layout box isn't, so we need to do this to
     // get the right dirty rect. Since this is called from LayoutObject::
     // setStyle, the relative position flag on the LayoutObject has been
     // cleared, so use the one on the style().
-    rect.move(layer()->offsetForInFlowPosition());
+    transformState.move(layer()->offsetForInFlowPosition(), accumulation);
   }
 
   LayoutBox* containerBox =
       container->isBox() ? toLayoutBox(container) : nullptr;
   if (containerBox && container != ancestor &&
-      !containerBox->mapScrollingContentsRectToBoxSpace(rect, visualRectFlags))
+      !containerBox->mapScrollingContentsRectToBoxSpace(
+          transformState, accumulation, visualRectFlags))
     return false;
 
   // TODO(wkorman): Generalize Ruby specialization and/or document more clearly.
-  if (containerBox && !isRuby())
+  if (containerBox && !isRuby()) {
+    transformState.flatten();
+    LayoutRect rect(transformState.lastPlanarQuad().boundingBox());

[Xianzhu, 2017/03/03 01:24:42]

Do we need enclosingBoundingBox here?

     containerBox->flipForWritingMode(rect);
-  return container->mapToVisualRectInAncestorSpace(ancestor, rect,
-                                                   visualRectFlags);
+    transformState.setQuad(FloatQuad(FloatRect(rect)));
+  }
+  return container->mapToVisualRectInAncestorSpaceInternal(
+      ancestor, transformState, visualRectFlags);
 }
 
 LayoutSize LayoutInline::offsetFromContainer(
     const LayoutObject* container) const {
   ASSERT(container == this->container());
 
   LayoutSize offset;
   if (isInFlowPositioned())
     offset += offsetForInFlowPosition();
 
@@ skipping 279 matching lines @@
     paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
 }
 
 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
 LayoutRect LayoutInline::debugRect() const {
   IntRect linesBox = enclosingIntRect(linesBoundingBox());
   return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height()));
 }
 
 }  // namespace blink