| 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 4295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4306 // FIXME: when the above mentioned bug is fixed, it should hopefully be poss
ible to call | 4306 // FIXME: when the above mentioned bug is fixed, it should hopefully be poss
ible to call |
| 4307 // clientBoxRect() or paddingBoxRect() in this method, rather than fiddling
with the edges on | 4307 // clientBoxRect() or paddingBoxRect() in this method, rather than fiddling
with the edges on |
| 4308 // our own. | 4308 // our own. |
| 4309 if (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) | 4309 if (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) |
| 4310 rect.contract(0, scrollBarHeight); | 4310 rect.contract(0, scrollBarHeight); |
| 4311 else | 4311 else |
| 4312 rect.contract(scrollBarWidth, scrollBarHeight); | 4312 rect.contract(scrollBarWidth, scrollBarHeight); |
| 4313 return rect; | 4313 return rect; |
| 4314 } | 4314 } |
| 4315 | 4315 |
| 4316 LayoutRect RenderBox::overflowRectForPaintRejection() const | |
| 4317 { | |
| 4318 LayoutRect overflowRect = visualOverflowRect(); | |
| 4319 if (!m_overflow || !usesCompositedScrolling()) | |
| 4320 return overflowRect; | |
| 4321 | |
| 4322 overflowRect.unite(layoutOverflowRect()); | |
| 4323 overflowRect.move(-scrolledContentOffset()); | |
| 4324 return overflowRect; | |
| 4325 } | |
| 4326 | |
| 4327 LayoutUnit RenderBox::offsetLeft() const | 4316 LayoutUnit RenderBox::offsetLeft() const |
| 4328 { | 4317 { |
| 4329 return adjustedPositionRelativeToOffsetParent(topLeftLocation()).x(); | 4318 return adjustedPositionRelativeToOffsetParent(topLeftLocation()).x(); |
| 4330 } | 4319 } |
| 4331 | 4320 |
| 4332 LayoutUnit RenderBox::offsetTop() const | 4321 LayoutUnit RenderBox::offsetTop() const |
| 4333 { | 4322 { |
| 4334 return adjustedPositionRelativeToOffsetParent(topLeftLocation()).y(); | 4323 return adjustedPositionRelativeToOffsetParent(topLeftLocation()).y(); |
| 4335 } | 4324 } |
| 4336 | 4325 |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4522 ASSERT(style()->hasBackground() || style()->hasBoxDecorations()); | 4511 ASSERT(style()->hasBackground() || style()->hasBoxDecorations()); |
| 4523 | 4512 |
| 4524 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) | 4513 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) |
| 4525 return m_rareData->m_previousBorderBoxSize; | 4514 return m_rareData->m_previousBorderBoxSize; |
| 4526 | 4515 |
| 4527 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. | 4516 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. |
| 4528 return previousBoundsSize; | 4517 return previousBoundsSize; |
| 4529 } | 4518 } |
| 4530 | 4519 |
| 4531 } // namespace blink | 4520 } // namespace blink |
| OLD | NEW |