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

Side by Side Diff: Source/core/layout/LayoutListMarker.cpp

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « Source/core/layout/LayoutListBox.cpp ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) 6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 case NoneListStyle: 604 case NoneListStyle:
605 return ""; 605 return "";
606 606
607 case Asterisks: { 607 case Asterisks: {
608 static const LChar asterisksSymbols[1] = { 608 static const LChar asterisksSymbols[1] = {
609 0x2A 609 0x2A
610 }; 610 };
611 return toSymbolic(value, asterisksSymbols); 611 return toSymbolic(value, asterisksSymbols);
612 } 612 }
613 // We use the same characters for text security. 613 // We use the same characters for text security.
614 // See RenderText::setInternalString. 614 // See LayoutText::setInternalString.
615 case Circle: 615 case Circle:
616 return String(&whiteBullet, 1); 616 return String(&whiteBullet, 1);
617 case Disc: 617 case Disc:
618 return String(&bullet, 1); 618 return String(&bullet, 1);
619 case Footnotes: { 619 case Footnotes: {
620 static const UChar footnotesSymbols[4] = { 620 static const UChar footnotesSymbols[4] = {
621 0x002A, 0x2051, 0x2020, 0x2021 621 0x002A, 0x2051, 0x2020, 0x2021
622 }; 622 };
623 return toSymbolic(value, footnotesSymbols); 623 return toSymbolic(value, footnotesSymbols);
624 } 624 }
(...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1641 if (style()) { 1641 if (style()) {
1642 // Reuse the current margins. Otherwise resetting the margins to initial values 1642 // Reuse the current margins. Otherwise resetting the margins to initial values
1643 // would trigger unnecessary layout. 1643 // would trigger unnecessary layout.
1644 newStyle->setMarginStart(style()->marginStart()); 1644 newStyle->setMarginStart(style()->marginStart());
1645 newStyle->setMarginEnd(style()->marginRight()); 1645 newStyle->setMarginEnd(style()->marginRight());
1646 } 1646 }
1647 setStyle(newStyle.release()); 1647 setStyle(newStyle.release());
1648 } 1648 }
1649 1649
1650 } // namespace blink 1650 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutListBox.cpp ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698