Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutInline.cpp

Issue 2446433002: Cleanups to remove an unnecessary parameter in LayoutBox::mapScrollingContentsRectToBoxSpace. (Closed)
Patch Set: none Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 // Apply the in-flow position offset when invalidating a rectangle. The 1206 // Apply the in-flow position offset when invalidating a rectangle. The
1207 // layer is translated, but the layout box isn't, so we need to do this to 1207 // layer is translated, but the layout box isn't, so we need to do this to
1208 // get the right dirty rect. Since this is called from LayoutObject:: 1208 // get the right dirty rect. Since this is called from LayoutObject::
1209 // setStyle, the relative position flag on the LayoutObject has been 1209 // setStyle, the relative position flag on the LayoutObject has been
1210 // cleared, so use the one on the style(). 1210 // cleared, so use the one on the style().
1211 rect.move(layer()->offsetForInFlowPosition()); 1211 rect.move(layer()->offsetForInFlowPosition());
1212 } 1212 }
1213 1213
1214 LayoutBox* containerBox = 1214 LayoutBox* containerBox =
1215 container->isBox() ? toLayoutBox(container) : nullptr; 1215 container->isBox() ? toLayoutBox(container) : nullptr;
1216 if (containerBox && 1216 if (containerBox && container != ancestor &&
1217 !containerBox->mapScrollingContentsRectToBoxSpace( 1217 !containerBox->mapScrollingContentsRectToBoxSpace(rect, visualRectFlags))
1218 rect, container == ancestor ? ApplyNonScrollOverflowClip
1219 : ApplyOverflowClip,
1220 visualRectFlags))
1221 return false; 1218 return false;
1222 1219
1223 // TODO(wkorman): Generalize Ruby specialization and/or document more clearly. 1220 // TODO(wkorman): Generalize Ruby specialization and/or document more clearly.
1224 if (containerBox && !isRuby()) 1221 if (containerBox && !isRuby())
1225 containerBox->flipForWritingMode(rect); 1222 containerBox->flipForWritingMode(rect);
1226 return container->mapToVisualRectInAncestorSpace(ancestor, rect, 1223 return container->mapToVisualRectInAncestorSpace(ancestor, rect,
1227 visualRectFlags); 1224 visualRectFlags);
1228 } 1225 }
1229 1226
1230 LayoutSize LayoutInline::offsetFromContainer( 1227 LayoutSize LayoutInline::offsetFromContainer(
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason); 1514 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
1518 } 1515 }
1519 1516
1520 // TODO(lunalu): Not to just dump 0, 0 as the x and y here 1517 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
1521 LayoutRect LayoutInline::debugRect() const { 1518 LayoutRect LayoutInline::debugRect() const {
1522 IntRect linesBox = enclosingIntRect(linesBoundingBox()); 1519 IntRect linesBox = enclosingIntRect(linesBoundingBox());
1523 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height())); 1520 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height()));
1524 } 1521 }
1525 1522
1526 } // namespace blink 1523 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698