| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
| 3 * Copyright (C) 2006 Apple Computer Inc. | 3 * Copyright (C) 2006 Apple Computer Inc. |
| 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 6 * Copyright (C) 2011 Torch Mobile (Beijing) CO. Ltd. All rights reserved. | 6 * Copyright (C) 2011 Torch Mobile (Beijing) CO. Ltd. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 // the transition to LayoutUnit-based types is complete (crbug.com/321237) | 111 // the transition to LayoutUnit-based types is complete (crbug.com/321237) |
| 112 LayoutRect boundingRect = enclosingLayoutRect(childRect); | 112 LayoutRect boundingRect = enclosingLayoutRect(childRect); |
| 113 parentBlock.setLocation(boundingRect.location()); | 113 parentBlock.setLocation(boundingRect.location()); |
| 114 parentBlock.setSize(boundingRect.size()); | 114 parentBlock.setSize(boundingRect.size()); |
| 115 | 115 |
| 116 // Position all children relative to the parent block. | 116 // Position all children relative to the parent block. |
| 117 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { | 117 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { |
| 118 // Skip generated content. | 118 // Skip generated content. |
| 119 if (!child->layoutObject().node()) | 119 if (!child->layoutObject().node()) |
| 120 continue; | 120 continue; |
| 121 child->adjustPosition(-childRect.x(), -childRect.y()); | 121 child->move(LayoutSize(-childRect.x(), -childRect.y())); |
| 122 } | 122 } |
| 123 | 123 |
| 124 // Position ourselves. | 124 // Position ourselves. |
| 125 setX(0); | 125 setX(0); |
| 126 setY(0); | 126 setY(0); |
| 127 setLogicalWidth(childRect.width()); | 127 setLogicalWidth(childRect.width()); |
| 128 setLogicalHeight(childRect.height()); | 128 setLogicalHeight(childRect.height()); |
| 129 setLineTopBottomPositions(0, boundingRect.height(), 0, boundingRect.height()
); | 129 setLineTopBottomPositions(0, boundingRect.height(), 0, boundingRect.height()
); |
| 130 } | 130 } |
| 131 | 131 |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 } | 227 } |
| 228 } | 228 } |
| 229 | 229 |
| 230 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri
butes) | 230 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri
butes) |
| 231 { | 231 { |
| 232 Vector<InlineBox*> leafBoxesInLogicalOrder; | 232 Vector<InlineBox*> leafBoxesInLogicalOrder; |
| 233 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang
eAndValueListsIfNeeded, &attributes); | 233 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang
eAndValueListsIfNeeded, &attributes); |
| 234 } | 234 } |
| 235 | 235 |
| 236 } // namespace blink | 236 } // namespace blink |
| OLD | NEW |