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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp

Issue 2686693002: Don't keep a static copy of a font's ellipsis character. (Closed)
Patch Set: bug 663855 Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/linux/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-expected.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
index f1601189b6dacb75bbfd2c045c40c8385ac9c019..7328c89a284079e8cfeb459a15e62b61c3fbb8b9 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
@@ -2354,9 +2354,7 @@ void LayoutBlockFlow::checkLinesForTextOverflow() {
fullstopCharacter};
DEFINE_STATIC_LOCAL(AtomicString, fullstopCharacterStr,
(fullStopString, fullStopStringLength));
- DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr,
- (&horizontalEllipsisCharacter, 1));
- AtomicString& selectedEllipsisStr = ellipsisStr;
+ AtomicString selectedEllipsisStr(&horizontalEllipsisCharacter, 1);
const Font& firstLineFont = firstLineStyle()->font();
// FIXME: We should probably not hard-code the direction here.
@@ -2384,7 +2382,6 @@ void LayoutBlockFlow::checkLinesForTextOverflow() {
if (!ellipsisWidth) {
ASSERT(font.primaryFont());
if (font.primaryFont()->glyphForCharacter(horizontalEllipsisCharacter)) {
- selectedEllipsisStr = ellipsisStr;
ellipsisWidth =
font.width(constructTextRun(font, &horizontalEllipsisCharacter, 1,
styleRef(), ellipsisDirection));
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/linux/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-expected.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698