| OLD | NEW |
| 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 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 if (container->hasOverflowClip()) { |
| 1105 LayoutBox* containerBox = toLayoutBox(container); | 1105 LayoutBox* containerBox = toLayoutBox(container); |
| 1106 containerBox->mapScrollingContentsRectToBoxSpace(rect); | 1106 containerBox->mapScrollingContentsRectToBoxSpace(rect); |
| 1107 if (container != ancestor && !containerBox->applyOverflowClip(rect, visu
alRectFlags)) | 1107 if (container != ancestor || !containerBox->scrollsOverflow()) { |
| 1108 return false; | 1108 if (!containerBox->applyOverflowClip(rect, visualRectFlags)) |
| 1109 return false; |
| 1110 } |
| 1109 } | 1111 } |
| 1110 | 1112 |
| 1111 if (ancestorSkipped) { | 1113 if (ancestorSkipped) { |
| 1112 // If the paintInvalidationContainer is below o, then we need to map the
rect into paintInvalidationContainer's coordinates. | 1114 // If the paintInvalidationContainer is below o, then we need to map the
rect into paintInvalidationContainer's coordinates. |
| 1113 LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(conta
iner); | 1115 LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(conta
iner); |
| 1114 rect.move(-containerOffset); | 1116 rect.move(-containerOffset); |
| 1115 return true; | 1117 return true; |
| 1116 } | 1118 } |
| 1117 | 1119 |
| 1118 return container->mapToVisualRectInAncestorSpace(ancestor, rect, visualRectF
lags); | 1120 return container->mapToVisualRectInAncestorSpace(ancestor, rect, visualRectF
lags); |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1369 | 1371 |
| 1370 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain
tInvalidationContainer, PaintInvalidationReason invalidationReason) const | 1372 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain
tInvalidationContainer, PaintInvalidationReason invalidationReason) const |
| 1371 { | 1373 { |
| 1372 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine
r, invalidationReason); | 1374 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine
r, invalidationReason); |
| 1373 | 1375 |
| 1374 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) | 1376 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) |
| 1375 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in
validationReason); | 1377 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in
validationReason); |
| 1376 } | 1378 } |
| 1377 | 1379 |
| 1378 } // namespace blink | 1380 } // namespace blink |
| OLD | NEW |