| 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 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. |
| 7 * All rights reserved. | 7 * All rights reserved. |
| 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 2032 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2043 layer()->setStaticBlockPosition(box->logicalTop()); | 2043 layer()->setStaticBlockPosition(box->logicalTop()); |
| 2044 } | 2044 } |
| 2045 | 2045 |
| 2046 if (container()->isLayoutInline()) | 2046 if (container()->isLayoutInline()) |
| 2047 moveWithEdgeOfInlineContainerIfNecessary(box->isHorizontal()); | 2047 moveWithEdgeOfInlineContainerIfNecessary(box->isHorizontal()); |
| 2048 | 2048 |
| 2049 // Nuke the box. | 2049 // Nuke the box. |
| 2050 box->remove(DontMarkLineBoxes); | 2050 box->remove(DontMarkLineBoxes); |
| 2051 box->destroy(); | 2051 box->destroy(); |
| 2052 } else if (isAtomicInlineLevel()) { | 2052 } else if (isAtomicInlineLevel()) { |
| 2053 // FIXME: the call to roundedLayoutPoint() below is temporary and should be | |
| 2054 // removed once the transition to LayoutUnit-based types is complete | |
| 2055 // (crbug.com/321237). | |
| 2056 setLocationAndUpdateOverflowControlsIfNeeded(box->topLeft()); | 2053 setLocationAndUpdateOverflowControlsIfNeeded(box->topLeft()); |
| 2057 setInlineBoxWrapper(box); | 2054 setInlineBoxWrapper(box); |
| 2058 } | 2055 } |
| 2059 } | 2056 } |
| 2060 | 2057 |
| 2061 void LayoutBox::moveWithEdgeOfInlineContainerIfNecessary(bool isHorizontal) { | 2058 void LayoutBox::moveWithEdgeOfInlineContainerIfNecessary(bool isHorizontal) { |
| 2062 ASSERT(isOutOfFlowPositioned() && container()->isLayoutInline() && | 2059 ASSERT(isOutOfFlowPositioned() && container()->isLayoutInline() && |
| 2063 container()->isInFlowPositioned()); | 2060 container()->isInFlowPositioned()); |
| 2064 // If this object is inside a relative positioned inline and its inline | 2061 // If this object is inside a relative positioned inline and its inline |
| 2065 // position is an explicit offset from the edge of its container then it will | 2062 // position is an explicit offset from the edge of its container then it will |
| (...skipping 3578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5644 LayoutRect rect = frameRect(); | 5641 LayoutRect rect = frameRect(); |
| 5645 | 5642 |
| 5646 LayoutBlock* block = containingBlock(); | 5643 LayoutBlock* block = containingBlock(); |
| 5647 if (block) | 5644 if (block) |
| 5648 block->adjustChildDebugRect(rect); | 5645 block->adjustChildDebugRect(rect); |
| 5649 | 5646 |
| 5650 return rect; | 5647 return rect; |
| 5651 } | 5648 } |
| 5652 | 5649 |
| 5653 } // namespace blink | 5650 } // namespace blink |
| OLD | NEW |