| 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 839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 850 | 850 |
| 851 LayoutUnit hyphenWidth = 0; | 851 LayoutUnit hyphenWidth = 0; |
| 852 if (toInlineTextBox(run->m_box)->hasHyphen()) { | 852 if (toInlineTextBox(run->m_box)->hasHyphen()) { |
| 853 const Font& font = renderer->style(lineInfo.isFirstLine())->font(); | 853 const Font& font = renderer->style(lineInfo.isFirstLine())->font(); |
| 854 hyphenWidth = measureHyphenWidth(renderer, font); | 854 hyphenWidth = measureHyphenWidth(renderer, font); |
| 855 } | 855 } |
| 856 float measuredWidth = 0; | 856 float measuredWidth = 0; |
| 857 | 857 |
| 858 bool kerningIsEnabled = font.typesettingFeatures() & Kerning; | 858 bool kerningIsEnabled = font.typesettingFeatures() & Kerning; |
| 859 | 859 |
| 860 #if OS(DARWIN) | 860 #if OS(MACOSX) |
| 861 // FIXME: Having any font feature settings enabled can lead to selection gap
s on | 861 // FIXME: Having any font feature settings enabled can lead to selection gap
s on |
| 862 // Chromium-mac. https://bugs.webkit.org/show_bug.cgi?id=113418 | 862 // Chromium-mac. https://bugs.webkit.org/show_bug.cgi?id=113418 |
| 863 bool canUseSimpleFontCodePath = renderer->canUseSimpleFontCodePath() && !fon
t.fontDescription().featureSettings(); | 863 bool canUseSimpleFontCodePath = renderer->canUseSimpleFontCodePath() && !fon
t.fontDescription().featureSettings(); |
| 864 #else | 864 #else |
| 865 bool canUseSimpleFontCodePath = renderer->canUseSimpleFontCodePath(); | 865 bool canUseSimpleFontCodePath = renderer->canUseSimpleFontCodePath(); |
| 866 #endif | 866 #endif |
| 867 | 867 |
| 868 // Since we don't cache glyph overflows, we need to re-measure the run if | 868 // Since we don't cache glyph overflows, we need to re-measure the run if |
| 869 // the style is linebox-contain: glyph. | 869 // the style is linebox-contain: glyph. |
| 870 | 870 |
| (...skipping 2651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3522 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); | 3522 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); |
| 3523 | 3523 |
| 3524 setLineGridBox(lineGridBox); | 3524 setLineGridBox(lineGridBox); |
| 3525 | 3525 |
| 3526 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying | 3526 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying |
| 3527 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping | 3527 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping |
| 3528 // to this grid. | 3528 // to this grid. |
| 3529 } | 3529 } |
| 3530 | 3530 |
| 3531 } | 3531 } |
| OLD | NEW |