| 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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 702 LayoutPoint topLeft; | 702 LayoutPoint topLeft; |
| 703 if (InlineBox* firstBox = firstLineBoxIncludingCulling()) { | 703 if (InlineBox* firstBox = firstLineBoxIncludingCulling()) { |
| 704 topLeft = firstBox->topLeft(); | 704 topLeft = firstBox->topLeft(); |
| 705 } | 705 } |
| 706 return adjustedPositionRelativeToOffsetParent(topLeft).y(); | 706 return adjustedPositionRelativeToOffsetParent(topLeft).y(); |
| 707 } | 707 } |
| 708 | 708 |
| 709 static LayoutUnit computeMargin(const LayoutInline* layoutObject, const Length&
margin) | 709 static LayoutUnit computeMargin(const LayoutInline* layoutObject, const Length&
margin) |
| 710 { | 710 { |
| 711 if (margin.isFixed()) | 711 if (margin.isFixed()) |
| 712 return margin.value(); | 712 return LayoutUnit(margin.value()); |
| 713 if (margin.hasPercent()) | 713 if (margin.hasPercent()) |
| 714 return minimumValueForLength(margin, std::max(LayoutUnit(), layoutObject
->containingBlock()->availableLogicalWidth())); | 714 return minimumValueForLength(margin, std::max(LayoutUnit(), layoutObject
->containingBlock()->availableLogicalWidth())); |
| 715 return LayoutUnit(); | 715 return LayoutUnit(); |
| 716 } | 716 } |
| 717 | 717 |
| 718 LayoutRectOutsets LayoutInline::marginBoxOutsets() const | 718 LayoutRectOutsets LayoutInline::marginBoxOutsets() const |
| 719 { | 719 { |
| 720 return LayoutRectOutsets(marginTop(), marginRight(), marginBottom(), marginL
eft()); | 720 return LayoutRectOutsets(marginTop(), marginRight(), marginBottom(), marginL
eft()); |
| 721 } | 721 } |
| 722 | 722 |
| (...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1419 | 1419 |
| 1420 AnnotatedRegionValue region; | 1420 AnnotatedRegionValue region; |
| 1421 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag; | 1421 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag; |
| 1422 region.bounds = LayoutRect(linesBoundingBox()); | 1422 region.bounds = LayoutRect(linesBoundingBox()); |
| 1423 | 1423 |
| 1424 LayoutObject* container = containingBlock(); | 1424 LayoutObject* container = containingBlock(); |
| 1425 if (!container) | 1425 if (!container) |
| 1426 container = this; | 1426 container = this; |
| 1427 | 1427 |
| 1428 FloatPoint absPos = container->localToAbsolute(); | 1428 FloatPoint absPos = container->localToAbsolute(); |
| 1429 region.bounds.setX(absPos.x() + region.bounds.x()); | 1429 region.bounds.setX(LayoutUnit(absPos.x() + region.bounds.x())); |
| 1430 region.bounds.setY(absPos.y() + region.bounds.y()); | 1430 region.bounds.setY(LayoutUnit(absPos.y() + region.bounds.y())); |
| 1431 | 1431 |
| 1432 regions.append(region); | 1432 regions.append(region); |
| 1433 } | 1433 } |
| 1434 | 1434 |
| 1435 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain
tInvalidationContainer, PaintInvalidationReason invalidationReason) const | 1435 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain
tInvalidationContainer, PaintInvalidationReason invalidationReason) const |
| 1436 { | 1436 { |
| 1437 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine
r, invalidationReason); | 1437 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine
r, invalidationReason); |
| 1438 | 1438 |
| 1439 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) | 1439 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) |
| 1440 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in
validationReason); | 1440 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in
validationReason); |
| 1441 } | 1441 } |
| 1442 | 1442 |
| 1443 } // namespace blink | 1443 } // namespace blink |
| OLD | NEW |