| 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. | 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 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1221 !containerBox->mapScrollingContentsRectToBoxSpace(rect, visualRectFlags)) | 1221 !containerBox->mapScrollingContentsRectToBoxSpace(rect, visualRectFlags)) |
| 1222 return false; | 1222 return false; |
| 1223 | 1223 |
| 1224 // TODO(wkorman): Generalize Ruby specialization and/or document more clearly. | 1224 // TODO(wkorman): Generalize Ruby specialization and/or document more clearly. |
| 1225 if (containerBox && !isRuby()) | 1225 if (containerBox && !isRuby()) |
| 1226 containerBox->flipForWritingMode(rect); | 1226 containerBox->flipForWritingMode(rect); |
| 1227 return container->mapToVisualRectInAncestorSpace(ancestor, rect, | 1227 return container->mapToVisualRectInAncestorSpace(ancestor, rect, |
| 1228 visualRectFlags); | 1228 visualRectFlags); |
| 1229 } | 1229 } |
| 1230 | 1230 |
| 1231 LayoutSize LayoutInline::offsetFromContainer( | 1231 LayoutSize LayoutInline::offsetFromContainer(const LayoutObject* container, |
| 1232 const LayoutObject* container) const { | 1232 bool ignoreSticky) const { |
| 1233 ASSERT(container == this->container()); | 1233 ASSERT(container == this->container()); |
| 1234 | 1234 |
| 1235 LayoutSize offset; | 1235 LayoutSize offset; |
| 1236 if (isInFlowPositioned()) | 1236 if (isInFlowPositioned()) |
| 1237 offset += offsetForInFlowPosition(); | 1237 offset += offsetForInFlowPosition(ignoreSticky); |
| 1238 | 1238 |
| 1239 if (container->hasOverflowClip()) | 1239 if (container->hasOverflowClip()) |
| 1240 offset -= toLayoutBox(container)->scrolledContentOffset(); | 1240 offset -= toLayoutBox(container)->scrolledContentOffset(); |
| 1241 | 1241 |
| 1242 return offset; | 1242 return offset; |
| 1243 } | 1243 } |
| 1244 | 1244 |
| 1245 PaintLayerType LayoutInline::layerTypeRequired() const { | 1245 PaintLayerType LayoutInline::layerTypeRequired() const { |
| 1246 return isInFlowPositioned() || createsGroup() || hasClipPath() || | 1246 return isInFlowPositioned() || createsGroup() || hasClipPath() || |
| 1247 style()->shouldCompositeForCurrentAnimations() || | 1247 style()->shouldCompositeForCurrentAnimations() || |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1518 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason); | 1518 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason); |
| 1519 } | 1519 } |
| 1520 | 1520 |
| 1521 // TODO(lunalu): Not to just dump 0, 0 as the x and y here | 1521 // TODO(lunalu): Not to just dump 0, 0 as the x and y here |
| 1522 LayoutRect LayoutInline::debugRect() const { | 1522 LayoutRect LayoutInline::debugRect() const { |
| 1523 IntRect linesBox = enclosingIntRect(linesBoundingBox()); | 1523 IntRect linesBox = enclosingIntRect(linesBoundingBox()); |
| 1524 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height())); | 1524 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height())); |
| 1525 } | 1525 } |
| 1526 | 1526 |
| 1527 } // namespace blink | 1527 } // namespace blink |
| OLD | NEW |