Cleanups to remove an unnecessary parameter in LayoutBox::mapScrollingContentsRectToBoxSpace.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1134 matching lines @@
     result = overflowClipRect(LayoutPoint());
 
   if (hasClip())
     result.intersect(clipRect(LayoutPoint()));
 
   return result;
 }
 
 bool LayoutBox::mapScrollingContentsRectToBoxSpace(
     LayoutRect& rect,
-    ApplyOverflowClipFlag applyOverflowClip,
     VisualRectFlags visualRectFlags) const {
   if (!hasClipRelatedProperty())
     return true;
 
-  if (applyOverflowClip == ApplyNonScrollOverflowClip)
-    return true;
-
   if (hasOverflowClip()) {
     LayoutSize offset = LayoutSize(-scrolledContentOffset());
     rect.move(offset);
   }
 
   // This won't work fully correctly for fixed-position elements, who should
   // receive CSS clip but for whom the current object is not in the containing
   // block chain.
   LayoutRect clipRect = clippingRect();
 
@@ skipping 1190 matching lines @@
     // LayoutObject::setStyle, the relative position flag on the LayoutObject
     // has been cleared, so use the one on the style().
     topLeft += layer()->offsetForInFlowPosition();
   }
 
   // FIXME: We ignore the lightweight clipping rect that controls use, since if
   // |o| is in mid-layout, its controlClipRect will be wrong. For overflow clip
   // we use the values cached by the layer.
   rect.setLocation(topLeft);
 
-  if (container->isBox() &&
+  if (container->isBox() && container != ancestor &&
       !toLayoutBox(container)->mapScrollingContentsRectToBoxSpace(
-          rect, container == ancestor ? ApplyNonScrollOverflowClip
-                                      : ApplyOverflowClip,
-          visualRectFlags))
+          rect, visualRectFlags))
     return false;
 
   if (ancestorSkipped) {
     // If the ancestor is below the container, then we need to map the rect into
     // ancestor's coordinates.
     LayoutSize containerOffset =
         ancestor->offsetFromAncestorContainer(container);
     rect.move(-containerOffset);
     // If the ancestor is fixed, then the rect is already in its coordinates so
     // doesn't need viewport-adjusting.
@@ skipping 3204 matching lines @@
   LayoutRect rect = frameRect();
 
   LayoutBlock* block = containingBlock();
   if (block)
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink