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. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
8 * | 8 * |
9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
(...skipping 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1933 // Our object was a block originally, so we make our normal flow pos
ition be | 1933 // Our object was a block originally, so we make our normal flow pos
ition be |
1934 // just below the line box (as though all the inlines that came befo
re us got | 1934 // just below the line box (as though all the inlines that came befo
re us got |
1935 // wrapped in an anonymous block, which is what would have happened
had we been | 1935 // wrapped in an anonymous block, which is what would have happened
had we been |
1936 // in flow). This value was cached in the y() of the box. | 1936 // in flow). This value was cached in the y() of the box. |
1937 layer()->setStaticBlockPosition(box->logicalTop()); | 1937 layer()->setStaticBlockPosition(box->logicalTop()); |
1938 if (style()->hasStaticBlockPosition(box->isHorizontal())) | 1938 if (style()->hasStaticBlockPosition(box->isHorizontal())) |
1939 setChildNeedsLayout(MarkOnlyThis); // Just go ahead and mark the
positioned object as needing layout, so it will update its position properly. | 1939 setChildNeedsLayout(MarkOnlyThis); // Just go ahead and mark the
positioned object as needing layout, so it will update its position properly. |
1940 } | 1940 } |
1941 | 1941 |
1942 // Nuke the box. | 1942 // Nuke the box. |
1943 box->remove(); | 1943 box->remove(DontMarkLineBoxes); |
1944 box->destroy(); | 1944 box->destroy(); |
1945 } else if (isReplaced()) { | 1945 } else if (isReplaced()) { |
1946 setLocation(roundedLayoutPoint(box->topLeft())); | 1946 setLocation(roundedLayoutPoint(box->topLeft())); |
1947 setInlineBoxWrapper(box); | 1947 setInlineBoxWrapper(box); |
1948 } | 1948 } |
1949 } | 1949 } |
1950 | 1950 |
1951 void RenderBox::deleteLineBoxWrapper() | 1951 void RenderBox::deleteLineBoxWrapper() |
1952 { | 1952 { |
1953 if (inlineBoxWrapper()) { | 1953 if (inlineBoxWrapper()) { |
(...skipping 2701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4655 return 0; | 4655 return 0; |
4656 | 4656 |
4657 if (!layoutState && !flowThreadContainingBlock()) | 4657 if (!layoutState && !flowThreadContainingBlock()) |
4658 return 0; | 4658 return 0; |
4659 | 4659 |
4660 RenderBlock* containerBlock = containingBlock(); | 4660 RenderBlock* containerBlock = containingBlock(); |
4661 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); | 4661 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); |
4662 } | 4662 } |
4663 | 4663 |
4664 } // namespace WebCore | 4664 } // namespace WebCore |
OLD | NEW |