| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1098 break; | 1098 break; |
| 1099 } | 1099 } |
| 1100 } | 1100 } |
| 1101 } | 1101 } |
| 1102 } | 1102 } |
| 1103 | 1103 |
| 1104 if (containingBlockPaintsContinuationOutline) { | 1104 if (containingBlockPaintsContinuationOutline) { |
| 1105 // Add ourselves to the containing block of the entire conti
nuation so that it can | 1105 // Add ourselves to the containing block of the entire conti
nuation so that it can |
| 1106 // paint us atomically. | 1106 // paint us atomically. |
| 1107 cb->addContinuationWithOutline(toRenderInline(renderer()->no
de()->renderer())); | 1107 cb->addContinuationWithOutline(toRenderInline(renderer()->no
de()->renderer())); |
| 1108 } else if (!inlineFlow->isInlineElementContinuation()) | 1108 } else if (!inlineFlow->isInlineElementContinuation()) { |
| 1109 paintInfo.outlineObjects->add(inlineFlow); | 1109 paintInfo.outlineObjects()->add(inlineFlow); |
| 1110 } |
| 1110 } | 1111 } |
| 1111 } else if (paintInfo.phase == PaintPhaseMask) { | 1112 } else if (paintInfo.phase == PaintPhaseMask) { |
| 1112 paintMask(paintInfo, paintOffset); | 1113 paintMask(paintInfo, paintOffset); |
| 1113 return; | 1114 return; |
| 1114 } else { | 1115 } else { |
| 1115 // Paint our background, border and box-shadow. | 1116 // Paint our background, border and box-shadow. |
| 1116 paintBoxDecorations(paintInfo, paintOffset); | 1117 paintBoxDecorations(paintInfo, paintOffset); |
| 1117 } | 1118 } |
| 1118 } | 1119 } |
| 1119 | 1120 |
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1635 ASSERT(child->prevOnLine() == prev); | 1636 ASSERT(child->prevOnLine() == prev); |
| 1636 prev = child; | 1637 prev = child; |
| 1637 } | 1638 } |
| 1638 ASSERT(prev == m_lastChild); | 1639 ASSERT(prev == m_lastChild); |
| 1639 #endif | 1640 #endif |
| 1640 } | 1641 } |
| 1641 | 1642 |
| 1642 #endif | 1643 #endif |
| 1643 | 1644 |
| 1644 } // namespace WebCore | 1645 } // namespace WebCore |
| OLD | NEW |