| 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) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 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 1733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1744 rectToApply = LayoutRect(clientRect.x(), clientRect.y(), max<LayoutU
nit>(0, oldClientAfterEdge - clientRect.x()), 1); | 1744 rectToApply = LayoutRect(clientRect.x(), clientRect.y(), max<LayoutU
nit>(0, oldClientAfterEdge - clientRect.x()), 1); |
| 1745 addLayoutOverflow(rectToApply); | 1745 addLayoutOverflow(rectToApply); |
| 1746 if (hasRenderOverflow()) | 1746 if (hasRenderOverflow()) |
| 1747 m_overflow->setLayoutClientAfterEdge(oldClientAfterEdge); | 1747 m_overflow->setLayoutClientAfterEdge(oldClientAfterEdge); |
| 1748 } | 1748 } |
| 1749 | 1749 |
| 1750 // Allow our overflow to catch cases where the caret in an empty editable el
ement with negative text indent needs to get painted. | 1750 // Allow our overflow to catch cases where the caret in an empty editable el
ement with negative text indent needs to get painted. |
| 1751 LayoutUnit textIndent = textIndentOffset(); | 1751 LayoutUnit textIndent = textIndentOffset(); |
| 1752 if (textIndent < 0) { | 1752 if (textIndent < 0) { |
| 1753 LayoutRect clientRect(noOverflowRect()); | 1753 LayoutRect clientRect(noOverflowRect()); |
| 1754 LayoutRect rectToApply = LayoutRect(clientRect.x() + min<LayoutUnit>(0,
textIndent), clientRect.y(), clientRect.width() - min<LayoutUnit>(0, textIndent)
, clientRect.height()); | 1754 LayoutRect rectToApply = LayoutRect(clientRect.x() + textIndent, clientR
ect.y(), clientRect.width() - textIndent, clientRect.height()); |
| 1755 addContentsVisualOverflow(rectToApply); | 1755 addContentsVisualOverflow(rectToApply); |
| 1756 } | 1756 } |
| 1757 | 1757 |
| 1758 // Add visual overflow from box-shadow and border-image-outset. | 1758 // Add visual overflow from box-shadow and border-image-outset. |
| 1759 addVisualEffectOverflow(); | 1759 addVisualEffectOverflow(); |
| 1760 | 1760 |
| 1761 // Add visual overflow from theme. | 1761 // Add visual overflow from theme. |
| 1762 addVisualOverflowFromTheme(); | 1762 addVisualOverflowFromTheme(); |
| 1763 | 1763 |
| 1764 if (isRenderNamedFlowThread()) | 1764 if (isRenderNamedFlowThread()) |
| (...skipping 6386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8151 | 8151 |
| 8152 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 8152 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
| 8153 { | 8153 { |
| 8154 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); | 8154 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); |
| 8155 } | 8155 } |
| 8156 | 8156 |
| 8157 | 8157 |
| 8158 #endif | 8158 #endif |
| 8159 | 8159 |
| 8160 } // namespace WebCore | 8160 } // namespace WebCore |
| OLD | NEW |