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 2325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2336 } else if (current.m_obj->isText()) { | 2336 } else if (current.m_obj->isText()) { |
2337 if (!current.m_pos) | 2337 if (!current.m_pos) |
2338 appliedStartWidth = false; | 2338 appliedStartWidth = false; |
2339 | 2339 |
2340 RenderText* t = toRenderText(current.m_obj); | 2340 RenderText* t = toRenderText(current.m_obj); |
2341 | 2341 |
2342 #if ENABLE(SVG) | 2342 #if ENABLE(SVG) |
2343 bool isSVGText = t->isSVGInlineText(); | 2343 bool isSVGText = t->isSVGInlineText(); |
2344 #endif | 2344 #endif |
2345 | 2345 |
2346 RenderStyle* style = t->style(lineInfo.isFirstLine()); | 2346 if (t->style()->hasTextCombine() && current.m_obj->isCombineText() &
& !toRenderCombineText(current.m_obj)->isCombined()) |
2347 if (style->hasTextCombine() && current.m_obj->isCombineText() && !to
RenderCombineText(current.m_obj)->isCombined()) | |
2348 toRenderCombineText(current.m_obj)->combineText(); | 2347 toRenderCombineText(current.m_obj)->combineText(); |
2349 | 2348 |
| 2349 RenderStyle* style = t->style(lineInfo.isFirstLine()); |
2350 const Font& f = style->font(); | 2350 const Font& f = style->font(); |
2351 bool isFixedPitch = f.isFixedPitch(); | 2351 bool isFixedPitch = f.isFixedPitch(); |
2352 bool canHyphenate = style->hyphens() == HyphensAuto && WebCore::canH
yphenate(style->locale()); | 2352 bool canHyphenate = style->hyphens() == HyphensAuto && WebCore::canH
yphenate(style->locale()); |
2353 | 2353 |
2354 int lastSpace = current.m_pos; | 2354 int lastSpace = current.m_pos; |
2355 float wordSpacing = currentStyle->wordSpacing(); | 2355 float wordSpacing = currentStyle->wordSpacing(); |
2356 float lastSpaceWordSpacing = 0; | 2356 float lastSpaceWordSpacing = 0; |
2357 | 2357 |
2358 // Non-zero only when kerning is enabled, in which case we measure w
ords with their trailing | 2358 // Non-zero only when kerning is enabled, in which case we measure w
ords with their trailing |
2359 // space, then subtract its width. | 2359 // space, then subtract its width. |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2867 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); | 2867 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); |
2868 | 2868 |
2869 setLineGridBox(lineGridBox); | 2869 setLineGridBox(lineGridBox); |
2870 | 2870 |
2871 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying | 2871 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying |
2872 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping | 2872 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping |
2873 // to this grid. | 2873 // to this grid. |
2874 } | 2874 } |
2875 | 2875 |
2876 } | 2876 } |
OLD | NEW |