| 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 3956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3967 | 3967 |
| 3968 if (extraWidthToEndOfLine) | 3968 if (extraWidthToEndOfLine) |
| 3969 *extraWidthToEndOfLine = x() + width() - rect.maxX(); | 3969 *extraWidthToEndOfLine = x() + width() - rect.maxX(); |
| 3970 | 3970 |
| 3971 // Move to local coords | 3971 // Move to local coords |
| 3972 rect.moveBy(-location()); | 3972 rect.moveBy(-location()); |
| 3973 | 3973 |
| 3974 // FIXME: Border/padding should be added for all elements but this workaroun
d | 3974 // FIXME: Border/padding should be added for all elements but this workaroun
d |
| 3975 // is needed because we use offsets inside an "atomic" element to represent | 3975 // is needed because we use offsets inside an "atomic" element to represent |
| 3976 // positions before and after the element in deprecated editing offsets. | 3976 // positions before and after the element in deprecated editing offsets. |
| 3977 if (node() && !(editingIgnoresContent(node()) || isRenderedTable(node()))) { | 3977 if (node() && !(editingIgnoresContent(node()) || isRenderedTableElement(node
()))) { |
| 3978 rect.setX(rect.x() + borderLeft() + paddingLeft()); | 3978 rect.setX(rect.x() + borderLeft() + paddingLeft()); |
| 3979 rect.setY(rect.y() + paddingTop() + borderTop()); | 3979 rect.setY(rect.y() + paddingTop() + borderTop()); |
| 3980 } | 3980 } |
| 3981 | 3981 |
| 3982 if (!isHorizontalWritingMode()) | 3982 if (!isHorizontalWritingMode()) |
| 3983 return rect.transposedRect(); | 3983 return rect.transposedRect(); |
| 3984 | 3984 |
| 3985 return rect; | 3985 return rect; |
| 3986 } | 3986 } |
| 3987 | 3987 |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4722 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 4722 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 4723 { | 4723 { |
| 4724 backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor); | 4724 backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor); |
| 4725 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 4725 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 4726 ASSERT(hasBackground == style.hasBackground()); | 4726 ASSERT(hasBackground == style.hasBackground()); |
| 4727 hasBorder = style.hasBorder(); | 4727 hasBorder = style.hasBorder(); |
| 4728 hasAppearance = style.hasAppearance(); | 4728 hasAppearance = style.hasAppearance(); |
| 4729 } | 4729 } |
| 4730 | 4730 |
| 4731 } // namespace blink | 4731 } // namespace blink |
| OLD | NEW |