| 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 4418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4429 { | 4429 { |
| 4430 if (!m_overflow) | 4430 if (!m_overflow) |
| 4431 return borderBoxRect(); | 4431 return borderBoxRect(); |
| 4432 if (hasOverflowClip()) | 4432 if (hasOverflowClip()) |
| 4433 return m_overflow->selfVisualOverflowRect(); | 4433 return m_overflow->selfVisualOverflowRect(); |
| 4434 return unionRect(m_overflow->selfVisualOverflowRect(), m_overflow->contentsV
isualOverflowRect()); | 4434 return unionRect(m_overflow->selfVisualOverflowRect(), m_overflow->contentsV
isualOverflowRect()); |
| 4435 } | 4435 } |
| 4436 | 4436 |
| 4437 LayoutUnit LayoutBox::offsetLeft() const | 4437 LayoutUnit LayoutBox::offsetLeft() const |
| 4438 { | 4438 { |
| 4439 return adjustedPositionRelativeToOffsetParent(topLeftLocation()).x(); | 4439 return adjustedPositionRelativeToUnclosedOffsetParent(topLeftLocation()).x()
; |
| 4440 } | 4440 } |
| 4441 | 4441 |
| 4442 LayoutUnit LayoutBox::offsetTop() const | 4442 LayoutUnit LayoutBox::offsetTop() const |
| 4443 { | 4443 { |
| 4444 return adjustedPositionRelativeToOffsetParent(topLeftLocation()).y(); | 4444 return adjustedPositionRelativeToUnclosedOffsetParent(topLeftLocation()).y()
; |
| 4445 } | 4445 } |
| 4446 | 4446 |
| 4447 LayoutPoint LayoutBox::flipForWritingModeForChild(const LayoutBox* child, const
LayoutPoint& point) const | 4447 LayoutPoint LayoutBox::flipForWritingModeForChild(const LayoutBox* child, const
LayoutPoint& point) const |
| 4448 { | 4448 { |
| 4449 if (!style()->isFlippedBlocksWritingMode()) | 4449 if (!style()->isFlippedBlocksWritingMode()) |
| 4450 return point; | 4450 return point; |
| 4451 | 4451 |
| 4452 // The child is going to add in its x(), so we have to make sure it ends up
in | 4452 // The child is going to add in its x(), so we have to make sure it ends up
in |
| 4453 // the right place. | 4453 // the right place. |
| 4454 return LayoutPoint(point.x() + size().width() - child->size().width() - (2 *
child->location().x()), point.y()); | 4454 return LayoutPoint(point.x() + size().width() - child->size().width() - (2 *
child->location().x()), point.y()); |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4875 m_rareData->m_snapAreas->remove(&snapArea); | 4875 m_rareData->m_snapAreas->remove(&snapArea); |
| 4876 } | 4876 } |
| 4877 } | 4877 } |
| 4878 | 4878 |
| 4879 SnapAreaSet* LayoutBox::snapAreas() const | 4879 SnapAreaSet* LayoutBox::snapAreas() const |
| 4880 { | 4880 { |
| 4881 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; | 4881 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; |
| 4882 } | 4882 } |
| 4883 | 4883 |
| 4884 } // namespace blink | 4884 } // namespace blink |
| OLD | NEW |