| 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 1489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1500 LayoutRect rectToApply; | 1500 LayoutRect rectToApply; |
| 1501 if (isHorizontalWritingMode()) | 1501 if (isHorizontalWritingMode()) |
| 1502 rectToApply = LayoutRect(clientRect.x(), clientRect.y(), 1, max<Layo
utUnit>(0, oldClientAfterEdge - clientRect.y())); | 1502 rectToApply = LayoutRect(clientRect.x(), clientRect.y(), 1, max<Layo
utUnit>(0, oldClientAfterEdge - clientRect.y())); |
| 1503 else | 1503 else |
| 1504 rectToApply = LayoutRect(clientRect.x(), clientRect.y(), max<LayoutU
nit>(0, oldClientAfterEdge - clientRect.x()), 1); | 1504 rectToApply = LayoutRect(clientRect.x(), clientRect.y(), max<LayoutU
nit>(0, oldClientAfterEdge - clientRect.x()), 1); |
| 1505 addLayoutOverflow(rectToApply); | 1505 addLayoutOverflow(rectToApply); |
| 1506 if (hasRenderOverflow()) | 1506 if (hasRenderOverflow()) |
| 1507 m_overflow->setLayoutClientAfterEdge(oldClientAfterEdge); | 1507 m_overflow->setLayoutClientAfterEdge(oldClientAfterEdge); |
| 1508 } | 1508 } |
| 1509 | 1509 |
| 1510 // Allow our overflow to catch cases where the caret in an empty editable el
ement with negative text indent needs to get painted. | |
| 1511 LayoutUnit textIndent = textIndentOffset(); | |
| 1512 if (textIndent < 0) { | |
| 1513 LayoutRect clientRect(noOverflowRect()); | |
| 1514 LayoutRect rectToApply = LayoutRect(clientRect.x() + textIndent, clientR
ect.y(), clientRect.width() - textIndent, clientRect.height()); | |
| 1515 addContentsVisualOverflow(rectToApply); | |
| 1516 } | |
| 1517 | |
| 1518 // Add visual overflow from box-shadow and border-image-outset. | 1510 // Add visual overflow from box-shadow and border-image-outset. |
| 1519 addVisualEffectOverflow(); | 1511 addVisualEffectOverflow(); |
| 1520 | 1512 |
| 1521 // Add visual overflow from theme. | 1513 // Add visual overflow from theme. |
| 1522 addVisualOverflowFromTheme(); | 1514 addVisualOverflowFromTheme(); |
| 1523 | 1515 |
| 1524 if (isRenderNamedFlowThread()) | 1516 if (isRenderNamedFlowThread()) |
| 1525 toRenderNamedFlowThread(this)->computeOversetStateForRegions(oldClientAf
terEdge); | 1517 toRenderNamedFlowThread(this)->computeOversetStateForRegions(oldClientAf
terEdge); |
| 1526 } | 1518 } |
| 1527 | 1519 |
| (...skipping 4260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5788 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 5780 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 5789 { | 5781 { |
| 5790 showRenderObject(); | 5782 showRenderObject(); |
| 5791 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 5783 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 5792 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 5784 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 5793 } | 5785 } |
| 5794 | 5786 |
| 5795 #endif | 5787 #endif |
| 5796 | 5788 |
| 5797 } // namespace WebCore | 5789 } // namespace WebCore |
| OLD | NEW |