Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 54743004: Rendering text-justify:distribute for 8 bit characters. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 continue; // Positioned objects are only participating to figure out their 1025 continue; // Positioned objects are only participating to figure out their
1026 // correct static x position. They have no effect on the width. 1026 // correct static x position. They have no effect on the width.
1027 // Similarly, line break boxes have no effect on the width . 1027 // Similarly, line break boxes have no effect on the width .
1028 if (r->m_object->isText()) { 1028 if (r->m_object->isText()) {
1029 RenderText* rt = toRenderText(r->m_object); 1029 RenderText* rt = toRenderText(r->m_object);
1030 if (textAlign == JUSTIFY && r != trailingSpaceRun && textJustify != TextJustifyNone) { 1030 if (textAlign == JUSTIFY && r != trailingSpaceRun && textJustify != TextJustifyNone) {
1031 if (!isAfterExpansion) 1031 if (!isAfterExpansion)
1032 toInlineTextBox(r->m_box)->setCanHaveLeadingExpansion(true); 1032 toInlineTextBox(r->m_box)->setCanHaveLeadingExpansion(true);
1033 unsigned opportunitiesInRun; 1033 unsigned opportunitiesInRun;
1034 if (rt->is8Bit()) 1034 if (rt->is8Bit())
1035 opportunitiesInRun = Font::expansionOpportunityCount(rt->cha racters8() + r->m_start, r->m_stop - r->m_start, r->m_box->direction(), isAfterE xpansion); 1035 opportunitiesInRun = Font::expansionOpportunityCount(rt->cha racters8() + r->m_start, r->m_stop - r->m_start, r->m_box->direction(), isAfterE xpansion, (textJustify == TextJustifyDistribute));
1036 else 1036 else
1037 opportunitiesInRun = Font::expansionOpportunityCount(rt->cha racters16() + r->m_start, r->m_stop - r->m_start, r->m_box->direction(), isAfter Expansion); 1037 opportunitiesInRun = Font::expansionOpportunityCount(rt->cha racters16() + r->m_start, r->m_stop - r->m_start, r->m_box->direction(), isAfter Expansion, (textJustify == TextJustifyDistribute));
1038 expansionOpportunities.append(opportunitiesInRun); 1038 expansionOpportunities.append(opportunitiesInRun);
1039 expansionOpportunityCount += opportunitiesInRun; 1039 expansionOpportunityCount += opportunitiesInRun;
1040 } 1040 }
1041 1041
1042 if (int length = rt->textLength()) { 1042 if (int length = rt->textLength()) {
1043 if (!r->m_start && needsWordSpacing && isSpaceOrNewline(rt->char acterAt(r->m_start))) 1043 if (!r->m_start && needsWordSpacing && isSpaceOrNewline(rt->char acterAt(r->m_start)))
1044 totalLogicalWidth += rt->style(lineInfo.isFirstLine())->font ().wordSpacing(); 1044 totalLogicalWidth += rt->style(lineInfo.isFirstLine())->font ().wordSpacing();
1045 needsWordSpacing = !isSpaceOrNewline(rt->characterAt(r->m_stop - 1)) && r->m_stop == length; 1045 needsWordSpacing = !isSpaceOrNewline(rt->characterAt(r->m_stop - 1)) && r->m_stop == length;
1046 } 1046 }
1047 1047
(...skipping 2475 matching lines...) Expand 10 before | Expand all | Expand 10 after
3523 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache); 3523 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache);
3524 3524
3525 setLineGridBox(lineGridBox); 3525 setLineGridBox(lineGridBox);
3526 3526
3527 // 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 // FIXME: If any of the characteristics of the box change compared to the ol d one, then we need to do a deep dirtying
3528 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping 3528 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping
3529 // to this grid. 3529 // to this grid.
3530 } 3530 }
3531 3531
3532 } 3532 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698