| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| index ceda19d736df198810bb3f7c2d9de80fdc95a461..c39f9aac4f2b546e8e3158ab8f4dc1e8c506ee93 100644 | 
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| @@ -2328,10 +2328,8 @@ bool LayoutBox::mapToVisualRectInAncestorSpace( | 
| if (ancestor == this) | 
| return true; | 
|  | 
| -  bool ancestorSkipped; | 
| -  bool filterSkipped; | 
| -  LayoutObject* container = | 
| -      this->container(ancestor, &ancestorSkipped, &filterSkipped); | 
| +  AncestorSkipInfo skipInfo(ancestor); | 
| +  LayoutObject* container = this->container(&skipInfo); | 
| LayoutBox* tableRowContainer = nullptr; | 
| // Skip table row because cells and rows are in the same coordinate space (see | 
| // below, however for more comments about when |ancestor| is the table row). | 
| @@ -2345,7 +2343,7 @@ bool LayoutBox::mapToVisualRectInAncestorSpace( | 
| if (!container) | 
| return true; | 
|  | 
| -  if (filterSkipped) | 
| +  if (skipInfo.filterSkipped) | 
| inflateVisualRectForFilterUnderContainer(rect, *container, ancestor); | 
|  | 
| // We are now in our parent container's coordinate space. Apply our transform | 
| @@ -2401,7 +2399,7 @@ bool LayoutBox::mapToVisualRectInAncestorSpace( | 
| rect, visualRectFlags)) | 
| return false; | 
|  | 
| -  if (ancestorSkipped) { | 
| +  if (skipInfo.ancestorSkipped) { | 
| // If the ancestor is below the container, then we need to map the rect into | 
| // ancestor's coordinates. | 
| LayoutSize containerOffset = | 
|  |