| 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  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights 
      reserved. | 4  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights 
      reserved. | 
| 5  * | 5  * | 
| 6  * This library is free software; you can redistribute it and/or | 6  * This library is free software; you can redistribute it and/or | 
| 7  * modify it under the terms of the GNU Library General Public | 7  * modify it under the terms of the GNU Library General Public | 
| 8  * License as published by the Free Software Foundation; either | 8  * License as published by the Free Software Foundation; either | 
| 9  * version 2 of the License, or (at your option) any later version. | 9  * version 2 of the License, or (at your option) any later version. | 
| 10  * | 10  * | 
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 203 void RenderInline::updateAlwaysCreateLineBoxes(bool fullLayout) | 203 void RenderInline::updateAlwaysCreateLineBoxes(bool fullLayout) | 
| 204 { | 204 { | 
| 205     // Once we have been tainted once, just assume it will happen again. This wa
      y effects like hover highlighting that change the | 205     // Once we have been tainted once, just assume it will happen again. This wa
      y effects like hover highlighting that change the | 
| 206     // background color will only cause a layout on the first rollover. | 206     // background color will only cause a layout on the first rollover. | 
| 207     if (m_alwaysCreateLineBoxes) | 207     if (m_alwaysCreateLineBoxes) | 
| 208         return; | 208         return; | 
| 209 | 209 | 
| 210     RenderStyle* parentStyle = parent()->style(); | 210     RenderStyle* parentStyle = parent()->style(); | 
| 211     RenderInline* parentRenderInline = parent()->isRenderInline() ? toRenderInli
      ne(parent()) : 0; | 211     RenderInline* parentRenderInline = parent()->isRenderInline() ? toRenderInli
      ne(parent()) : 0; | 
| 212     bool checkFonts = document().inNoQuirksMode(); | 212     bool checkFonts = document().inNoQuirksMode(); | 
| 213     RenderFlowThread* flowThread = flowThreadContainingBlock(); |  | 
| 214     bool alwaysCreateLineBoxes = (parentRenderInline && parentRenderInline->alwa
      ysCreateLineBoxes()) | 213     bool alwaysCreateLineBoxes = (parentRenderInline && parentRenderInline->alwa
      ysCreateLineBoxes()) | 
| 215         || (parentRenderInline && parentStyle->verticalAlign() != BASELINE) | 214         || (parentRenderInline && parentStyle->verticalAlign() != BASELINE) | 
| 216         || style()->verticalAlign() != BASELINE | 215         || style()->verticalAlign() != BASELINE | 
| 217         || style()->textEmphasisMark() != TextEmphasisMarkNone | 216         || style()->textEmphasisMark() != TextEmphasisMarkNone | 
| 218         || (checkFonts && (!parentStyle->font().fontMetrics().hasIdenticalAscent
      DescentAndLineGap(style()->font().fontMetrics()) | 217         || (checkFonts && (!parentStyle->font().fontMetrics().hasIdenticalAscent
      DescentAndLineGap(style()->font().fontMetrics()) | 
| 219         || parentStyle->lineHeight() != style()->lineHeight())) | 218         || parentStyle->lineHeight() != style()->lineHeight())); | 
| 220         || (flowThread && flowThread->hasRegionsWithStyling()); |  | 
| 221 | 219 | 
| 222     if (!alwaysCreateLineBoxes && checkFonts && document().styleEngine()->usesFi
      rstLineRules()) { | 220     if (!alwaysCreateLineBoxes && checkFonts && document().styleEngine()->usesFi
      rstLineRules()) { | 
| 223         // Have to check the first line style as well. | 221         // Have to check the first line style as well. | 
| 224         parentStyle = parent()->style(true); | 222         parentStyle = parent()->style(true); | 
| 225         RenderStyle* childStyle = style(true); | 223         RenderStyle* childStyle = style(true); | 
| 226         alwaysCreateLineBoxes = !parentStyle->font().fontMetrics().hasIdenticalA
      scentDescentAndLineGap(childStyle->font().fontMetrics()) | 224         alwaysCreateLineBoxes = !parentStyle->font().fontMetrics().hasIdenticalA
      scentDescentAndLineGap(childStyle->font().fontMetrics()) | 
| 227         || childStyle->verticalAlign() != BASELINE | 225         || childStyle->verticalAlign() != BASELINE | 
| 228         || parentStyle->lineHeight() != childStyle->lineHeight(); | 226         || parentStyle->lineHeight() != childStyle->lineHeight(); | 
| 229     } | 227     } | 
| 230 | 228 | 
| (...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1574         container = this; | 1572         container = this; | 
| 1575 | 1573 | 
| 1576     FloatPoint absPos = container->localToAbsolute(); | 1574     FloatPoint absPos = container->localToAbsolute(); | 
| 1577     region.bounds.setX(absPos.x() + region.bounds.x()); | 1575     region.bounds.setX(absPos.x() + region.bounds.x()); | 
| 1578     region.bounds.setY(absPos.y() + region.bounds.y()); | 1576     region.bounds.setY(absPos.y() + region.bounds.y()); | 
| 1579 | 1577 | 
| 1580     regions.append(region); | 1578     regions.append(region); | 
| 1581 } | 1579 } | 
| 1582 | 1580 | 
| 1583 } // namespace WebCore | 1581 } // namespace WebCore | 
| OLD | NEW | 
|---|