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

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

Issue 54743004: Rendering text-justify:distribute for 8 bit characters. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use const parameter Created 6 years, 7 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 1524 matching lines...) Expand 10 before | Expand all | Expand 10 after
1535 charactersWithHyphen->append(hyphenString); 1535 charactersWithHyphen->append(hyphenString);
1536 string = charactersWithHyphen->toString().createView(); 1536 string = charactersWithHyphen->toString().createView();
1537 maximumLength = string.length(); 1537 maximumLength = string.length();
1538 } 1538 }
1539 1539
1540 ASSERT(maximumLength >= static_cast<int>(string.length())); 1540 ASSERT(maximumLength >= static_cast<int>(string.length()));
1541 1541
1542 TextRun run(string, textPos(), expansion(), expansionBehavior(), direction() , dirOverride() || style->rtlOrdering() == VisualOrder, !textRenderer().canUseSi mpleFontCodePath()); 1542 TextRun run(string, textPos(), expansion(), expansionBehavior(), direction() , dirOverride() || style->rtlOrdering() == VisualOrder, !textRenderer().canUseSi mpleFontCodePath());
1543 run.setTabSize(!style->collapseWhiteSpace(), style->tabSize()); 1543 run.setTabSize(!style->collapseWhiteSpace(), style->tabSize());
1544 run.setCharacterScanForCodePath(!textRenderer().canUseSimpleFontCodePath()); 1544 run.setCharacterScanForCodePath(!textRenderer().canUseSimpleFontCodePath());
1545 run.setDistributeJustification(style->textJustify() == TextJustifyDistribute );
1545 if (textRunNeedsRenderingContext(font)) 1546 if (textRunNeedsRenderingContext(font))
1546 run.setRenderingContext(SVGTextRunRenderingContext::create(&textRenderer ())); 1547 run.setRenderingContext(SVGTextRunRenderingContext::create(&textRenderer ()));
1547 1548
1548 // Propagate the maximum length of the characters buffer to the TextRun, eve n when we're only processing a substring. 1549 // Propagate the maximum length of the characters buffer to the TextRun, eve n when we're only processing a substring.
1549 run.setCharactersLength(maximumLength); 1550 run.setCharactersLength(maximumLength);
1550 ASSERT(run.charactersLength() >= run.length()); 1551 ASSERT(run.charactersLength() >= run.length());
1551 return run; 1552 return run;
1552 } 1553 }
1553 1554
1554 TextRun InlineTextBox::constructTextRunForInspector(RenderStyle* style, const Fo nt& font) const 1555 TextRun InlineTextBox::constructTextRunForInspector(RenderStyle* style, const Fo nt& font) const
(...skipping 21 matching lines...) Expand all
1576 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj); 1577 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj);
1577 const int rendererCharacterOffset = 24; 1578 const int rendererCharacterOffset = 24;
1578 for (; printedCharacters < rendererCharacterOffset; printedCharacters++) 1579 for (; printedCharacters < rendererCharacterOffset; printedCharacters++)
1579 fputc(' ', stderr); 1580 fputc(' ', stderr);
1580 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata()); 1581 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata());
1581 } 1582 }
1582 1583
1583 #endif 1584 #endif
1584 1585
1585 } // namespace WebCore 1586 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698