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

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

Issue 255323004: Rendering text-justify:distribute for 8 bit characters. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: New patchset (with 'const') Created 6 years, 6 months 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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights 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 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 charactersWithHyphen->append(hyphenString); 1533 charactersWithHyphen->append(hyphenString);
1534 string = charactersWithHyphen->toString().createView(); 1534 string = charactersWithHyphen->toString().createView();
1535 maximumLength = string.length(); 1535 maximumLength = string.length();
1536 } 1536 }
1537 1537
1538 ASSERT(maximumLength >= static_cast<int>(string.length())); 1538 ASSERT(maximumLength >= static_cast<int>(string.length()));
1539 1539
1540 TextRun run(string, textPos(), expansion(), expansionBehavior(), direction() , dirOverride() || style->rtlOrdering() == VisualOrder, !textRenderer().canUseSi mpleFontCodePath()); 1540 TextRun run(string, textPos(), expansion(), expansionBehavior(), direction() , dirOverride() || style->rtlOrdering() == VisualOrder, !textRenderer().canUseSi mpleFontCodePath());
1541 run.setTabSize(!style->collapseWhiteSpace(), style->tabSize()); 1541 run.setTabSize(!style->collapseWhiteSpace(), style->tabSize());
1542 run.setCharacterScanForCodePath(!textRenderer().canUseSimpleFontCodePath()); 1542 run.setCharacterScanForCodePath(!textRenderer().canUseSimpleFontCodePath());
1543 run.setDistributeJustification(style->textJustify() == TextJustifyDistribute );
1543 if (textRunNeedsRenderingContext(font)) 1544 if (textRunNeedsRenderingContext(font))
1544 run.setRenderingContext(SVGTextRunRenderingContext::create(&textRenderer ())); 1545 run.setRenderingContext(SVGTextRunRenderingContext::create(&textRenderer ()));
1545 1546
1546 // Propagate the maximum length of the characters buffer to the TextRun, eve n when we're only processing a substring. 1547 // Propagate the maximum length of the characters buffer to the TextRun, eve n when we're only processing a substring.
1547 run.setCharactersLength(maximumLength); 1548 run.setCharactersLength(maximumLength);
1548 ASSERT(run.charactersLength() >= run.length()); 1549 ASSERT(run.charactersLength() >= run.length());
1549 return run; 1550 return run;
1550 } 1551 }
1551 1552
1552 TextRun InlineTextBox::constructTextRunForInspector(RenderStyle* style, const Fo nt& font) const 1553 TextRun InlineTextBox::constructTextRunForInspector(RenderStyle* style, const Fo nt& font) const
(...skipping 21 matching lines...) Expand all
1574 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj); 1575 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj);
1575 const int rendererCharacterOffset = 24; 1576 const int rendererCharacterOffset = 24;
1576 for (; printedCharacters < rendererCharacterOffset; printedCharacters++) 1577 for (; printedCharacters < rendererCharacterOffset; printedCharacters++)
1577 fputc(' ', stderr); 1578 fputc(' ', stderr);
1578 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata()); 1579 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata());
1579 } 1580 }
1580 1581
1581 #endif 1582 #endif
1582 1583
1583 } // namespace WebCore 1584 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698