| OLD | NEW | 
|     1 /* |     1 /* | 
|     2  * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |     2  * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 
|     3  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
      ight reserved. |     3  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
      ight reserved. | 
|     4  * Copyright (C) 2010 Google Inc. All rights reserved. |     4  * Copyright (C) 2010 Google 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 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1390             } else if (child->isText()) { |  1390             } else if (child->isText()) { | 
|  1391                 // Case (3). Text. |  1391                 // Case (3). Text. | 
|  1392                 RenderText* t = toRenderText(child); |  1392                 RenderText* t = toRenderText(child); | 
|  1393  |  1393  | 
|  1394                 if (t->isWordBreak()) { |  1394                 if (t->isWordBreak()) { | 
|  1395                     minLogicalWidth = std::max(minLogicalWidth, inlineMin.toLayo
      utUnit()); |  1395                     minLogicalWidth = std::max(minLogicalWidth, inlineMin.toLayo
      utUnit()); | 
|  1396                     inlineMin = FloatWillBeLayoutUnit(); |  1396                     inlineMin = FloatWillBeLayoutUnit(); | 
|  1397                     continue; |  1397                     continue; | 
|  1398                 } |  1398                 } | 
|  1399  |  1399  | 
|  1400                 if (t->style()->hasTextCombine() && t->isCombineText()) |  | 
|  1401                     toRenderCombineText(t)->combineText(); |  | 
|  1402  |  | 
|  1403                 // Determine if we have a breakable character. Pass in |  1400                 // Determine if we have a breakable character. Pass in | 
|  1404                 // whether or not we should ignore any spaces at the front |  1401                 // whether or not we should ignore any spaces at the front | 
|  1405                 // of the string. If those are going to be stripped out, |  1402                 // of the string. If those are going to be stripped out, | 
|  1406                 // then they shouldn't be considered in the breakable char |  1403                 // then they shouldn't be considered in the breakable char | 
|  1407                 // check. |  1404                 // check. | 
|  1408                 bool hasBreakableChar, hasBreak; |  1405                 bool hasBreakableChar, hasBreak; | 
|  1409                 FloatWillBeLayoutUnit firstLineMinWidth, lastLineMinWidth; |  1406                 FloatWillBeLayoutUnit firstLineMinWidth, lastLineMinWidth; | 
|  1410                 bool hasBreakableStart, hasBreakableEnd; |  1407                 bool hasBreakableStart, hasBreakableEnd; | 
|  1411                 FloatWillBeLayoutUnit firstLineMaxWidth, lastLineMaxWidth; |  1408                 FloatWillBeLayoutUnit firstLineMaxWidth, lastLineMaxWidth; | 
|  1412                 t->trimmedPrefWidths(inlineMax, |  1409                 t->trimmedPrefWidths(inlineMax, | 
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2051     float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
      (); |  2048     float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
      (); | 
|  2052     float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
      se) - logicalLeft; |  2049     float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
      se) - logicalLeft; | 
|  2053     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
      th, availableLogicalWidth, 0); |  2050     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
      th, availableLogicalWidth, 0); | 
|  2054  |  2051  | 
|  2055     if (!style()->isLeftToRightDirection()) |  2052     if (!style()->isLeftToRightDirection()) | 
|  2056         return logicalWidth() - logicalLeft; |  2053         return logicalWidth() - logicalLeft; | 
|  2057     return logicalLeft; |  2054     return logicalLeft; | 
|  2058 } |  2055 } | 
|  2059  |  2056  | 
|  2060 } |  2057 } | 
| OLD | NEW |