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 * | 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 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1476 layer()->setStaticBlockPosition(box->logicalTop()); | 1476 layer()->setStaticBlockPosition(box->logicalTop()); |
1477 if (style()->hasStaticBlockPosition(box->isHorizontal())) | 1477 if (style()->hasStaticBlockPosition(box->isHorizontal())) |
1478 setChildNeedsLayout(true, false); // Just go ahead and mark the
positioned object as needing layout, so it will update its position properly. | 1478 setChildNeedsLayout(true, false); // Just go ahead and mark the
positioned object as needing layout, so it will update its position properly. |
1479 } | 1479 } |
1480 | 1480 |
1481 // Nuke the box. | 1481 // Nuke the box. |
1482 box->remove(); | 1482 box->remove(); |
1483 box->destroy(renderArena()); | 1483 box->destroy(renderArena()); |
1484 } else if (isReplaced()) { | 1484 } else if (isReplaced()) { |
1485 setLocation(roundedLayoutPoint(FloatPoint(box->x(), box->y()))); | 1485 setLocation(roundedLayoutPoint(FloatPoint(box->x(), box->y()))); |
1486 if (m_inlineBoxWrapper) | 1486 ASSERT(!m_inlineBoxWrapper); |
1487 deleteLineBoxWrapper(); | |
1488 m_inlineBoxWrapper = box; | 1487 m_inlineBoxWrapper = box; |
1489 } | 1488 } |
1490 } | 1489 } |
1491 | 1490 |
1492 void RenderBox::deleteLineBoxWrapper() | 1491 void RenderBox::deleteLineBoxWrapper() |
1493 { | 1492 { |
1494 if (m_inlineBoxWrapper) { | 1493 if (m_inlineBoxWrapper) { |
1495 if (!documentBeingDestroyed()) | 1494 if (!documentBeingDestroyed()) |
1496 m_inlineBoxWrapper->remove(); | 1495 m_inlineBoxWrapper->remove(); |
1497 m_inlineBoxWrapper->destroy(renderArena()); | 1496 m_inlineBoxWrapper->destroy(renderArena()); |
(...skipping 2383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3881 RenderBlock* containerBlock = containingBlock(); | 3880 RenderBlock* containerBlock = containingBlock(); |
3882 if (!containerBlock || containerBlock == this) | 3881 if (!containerBlock || containerBlock == this) |
3883 return locationOffset(); | 3882 return locationOffset(); |
3884 | 3883 |
3885 LayoutRect rect(frameRect()); | 3884 LayoutRect rect(frameRect()); |
3886 containerBlock->flipForWritingMode(rect); // FIXME: This is wrong if we are
an absolutely positioned object enclosed by a relative-positioned inline. | 3885 containerBlock->flipForWritingMode(rect); // FIXME: This is wrong if we are
an absolutely positioned object enclosed by a relative-positioned inline. |
3887 return LayoutSize(rect.x(), rect.y()); | 3886 return LayoutSize(rect.x(), rect.y()); |
3888 } | 3887 } |
3889 | 3888 |
3890 } // namespace WebCore | 3889 } // namespace WebCore |
OLD | NEW |