| 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 979 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 990 } | 990 } |
| 991 | 991 |
| 992 void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
LayoutUnit lineTop, LayoutUnit lineBottom) | 992 void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
LayoutUnit lineTop, LayoutUnit lineBottom) |
| 993 { | 993 { |
| 994 LayoutRect overflowRect(visualOverflowRect(lineTop, lineBottom)); | 994 LayoutRect overflowRect(visualOverflowRect(lineTop, lineBottom)); |
| 995 overflowRect.moveBy(paintOffset); | 995 overflowRect.moveBy(paintOffset); |
| 996 | 996 |
| 997 if (!paintInfo.rect.intersects(pixelSnappedIntRect(overflowRect))) | 997 if (!paintInfo.rect.intersects(pixelSnappedIntRect(overflowRect))) |
| 998 return; | 998 return; |
| 999 | 999 |
| 1000 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe
lfOutline) | 1000 if (paintInfo.phase == PaintPhaseMask) { |
| 1001 && renderer().style()->hasOutline() && !isRootInlineBox()) { | |
| 1002 RenderInline& inlineFlow = toRenderInline(renderer()); | |
| 1003 paintInfo.outlineObjects()->add(&inlineFlow); | |
| 1004 } else if (paintInfo.phase == PaintPhaseMask) { | |
| 1005 paintMask(paintInfo, paintOffset); | 1001 paintMask(paintInfo, paintOffset); |
| 1006 return; | 1002 return; |
| 1007 } else if (paintInfo.phase == PaintPhaseForeground) { | 1003 } else if (paintInfo.phase == PaintPhaseForeground) { |
| 1008 // Paint our background, border and box-shadow. | 1004 // Paint our background, border and box-shadow. |
| 1009 paintBoxDecorationBackground(paintInfo, paintOffset); | 1005 paintBoxDecorationBackground(paintInfo, paintOffset); |
| 1010 } | 1006 } |
| 1011 | 1007 |
| 1012 // Paint our children. | 1008 // Paint our children. |
| 1013 if (paintInfo.phase != PaintPhaseSelfOutline) { | 1009 if (paintInfo.phase != PaintPhaseSelfOutline) { |
| 1014 PaintInfo childInfo(paintInfo); | 1010 PaintInfo childInfo(paintInfo); |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1425 ASSERT(child->prevOnLine() == prev); | 1421 ASSERT(child->prevOnLine() == prev); |
| 1426 prev = child; | 1422 prev = child; |
| 1427 } | 1423 } |
| 1428 ASSERT(prev == m_lastChild); | 1424 ASSERT(prev == m_lastChild); |
| 1429 #endif | 1425 #endif |
| 1430 } | 1426 } |
| 1431 | 1427 |
| 1432 #endif | 1428 #endif |
| 1433 | 1429 |
| 1434 } // namespace blink | 1430 } // namespace blink |
| OLD | NEW |