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

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

Issue 1856993004: Let mapToVisualRectInAncestorSpace apply ancestor clip if not scrollsOverflow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Saturated
Patch Set: Created 4 years, 8 months 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. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 // Apply the in-flow position offset when invalidating a rectangle. The layer 1094 // Apply the in-flow position offset when invalidating a rectangle. The layer
1095 // is translated, but the layout box isn't, so we need to do this to get the 1095 // is translated, but the layout box isn't, so we need to do this to get the
1096 // right dirty rect. Since this is called from LayoutObject::setStyle, t he relative position 1096 // right dirty rect. Since this is called from LayoutObject::setStyle, t he relative position
1097 // flag on the LayoutObject has been cleared, so use the one on the styl e(). 1097 // flag on the LayoutObject has been cleared, so use the one on the styl e().
1098 topLeft += layer()->offsetForInFlowPosition(); 1098 topLeft += layer()->offsetForInFlowPosition();
1099 } 1099 }
1100 1100
1101 // FIXME: We ignore the lightweight clipping rect that controls use, since i f |o| is in mid-layout, 1101 // FIXME: We ignore the lightweight clipping rect that controls use, since i f |o| is in mid-layout,
1102 // its controlClipRect will be wrong. For overflow clip we use the values ca ched by the layer. 1102 // its controlClipRect will be wrong. For overflow clip we use the values ca ched by the layer.
1103 rect.setLocation(topLeft); 1103 rect.setLocation(topLeft);
1104 if (container->hasOverflowClip()) { 1104
1105 LayoutBox* containerBox = toLayoutBox(container); 1105 if (container->isBox() && !toLayoutBox(container)->mapScrollingContentsRectT oBoxSpace(rect, container == ancestor ? ApplyNonScrollOverflowClip : ApplyOverfl owClip, visualRectFlags))
1106 containerBox->mapScrollingContentsRectToBoxSpace(rect); 1106 return false;
1107 if (container != ancestor && !containerBox->applyOverflowClip(rect, visu alRectFlags))
1108 return false;
1109 }
1110 1107
1111 if (ancestorSkipped) { 1108 if (ancestorSkipped) {
1112 // If the paintInvalidationContainer is below o, then we need to map the rect into paintInvalidationContainer's coordinates. 1109 // If the paintInvalidationContainer is below o, then we need to map the rect into paintInvalidationContainer's coordinates.
1113 LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(conta iner); 1110 LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(conta iner);
1114 rect.move(-containerOffset); 1111 rect.move(-containerOffset);
1115 return true; 1112 return true;
1116 } 1113 }
1117 1114
1118 return container->mapToVisualRectInAncestorSpace(ancestor, rect, visualRectF lags); 1115 return container->mapToVisualRectInAncestorSpace(ancestor, rect, visualRectF lags);
1119 } 1116 }
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 1366
1370 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const 1367 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const
1371 { 1368 {
1372 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason); 1369 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason);
1373 1370
1374 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1371 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1375 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason); 1372 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason);
1376 } 1373 }
1377 1374
1378 } // namespace blink 1375 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698