| 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 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 897 | 897 |
| 898 void InlineFlowBox::computeOverflow(LayoutUnit lineTop, LayoutUnit lineBottom, G
lyphOverflowAndFallbackFontsMap& textBoxDataMap) | 898 void InlineFlowBox::computeOverflow(LayoutUnit lineTop, LayoutUnit lineBottom, G
lyphOverflowAndFallbackFontsMap& textBoxDataMap) |
| 899 { | 899 { |
| 900 // If we know we have no overflow, we can just bail. | 900 // If we know we have no overflow, we can just bail. |
| 901 if (knownToHaveNoOverflow()) { | 901 if (knownToHaveNoOverflow()) { |
| 902 ASSERT(!m_overflow); | 902 ASSERT(!m_overflow); |
| 903 return; | 903 return; |
| 904 } | 904 } |
| 905 | 905 |
| 906 if (m_overflow) | 906 if (m_overflow) |
| 907 m_overflow.clear(); | 907 m_overflow.reset(); |
| 908 | 908 |
| 909 // Visual overflow just includes overflow for stuff we need to issues paint
invalidations for ourselves. Self-painting layers are ignored. | 909 // Visual overflow just includes overflow for stuff we need to issues paint
invalidations for ourselves. Self-painting layers are ignored. |
| 910 // Layout overflow is used to determine scrolling extent, so it still includ
es child layers and also factors in | 910 // Layout overflow is used to determine scrolling extent, so it still includ
es child layers and also factors in |
| 911 // transforms, relative positioning, etc. | 911 // transforms, relative positioning, etc. |
| 912 LayoutRect logicalLayoutOverflow(logicalFrameRectIncludingLineHeight(lineTop
, lineBottom)); | 912 LayoutRect logicalLayoutOverflow(logicalFrameRectIncludingLineHeight(lineTop
, lineBottom)); |
| 913 LayoutRect logicalVisualOverflow(logicalLayoutOverflow); | 913 LayoutRect logicalVisualOverflow(logicalLayoutOverflow); |
| 914 | 914 |
| 915 addBoxShadowVisualOverflow(logicalVisualOverflow); | 915 addBoxShadowVisualOverflow(logicalVisualOverflow); |
| 916 addBorderOutsetVisualOverflow(logicalVisualOverflow); | 916 addBorderOutsetVisualOverflow(logicalVisualOverflow); |
| 917 addOutlineVisualOverflow(logicalVisualOverflow); | 917 addOutlineVisualOverflow(logicalVisualOverflow); |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1314 ASSERT(child->prevOnLine() == prev); | 1314 ASSERT(child->prevOnLine() == prev); |
| 1315 prev = child; | 1315 prev = child; |
| 1316 } | 1316 } |
| 1317 ASSERT(prev == m_lastChild); | 1317 ASSERT(prev == m_lastChild); |
| 1318 #endif | 1318 #endif |
| 1319 } | 1319 } |
| 1320 | 1320 |
| 1321 #endif | 1321 #endif |
| 1322 | 1322 |
| 1323 } // namespace blink | 1323 } // namespace blink |
| OLD | NEW |