diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 00:11:53 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 00:11:53 +0000 |
| commit | 18c5147cfb127b2177e734933e16385f37000aa3 (patch) | |
| tree | 47a5fcdb9e7e792205104f43e4c864d4421eb1ea /ui/gfx/break_list.h | |
| parent | 07d666d1cc53ed255e51263adf8370246468a9f4 (diff) | |
| download | chromium_src-18c5147cfb127b2177e734933e16385f37000aa3.zip chromium_src-18c5147cfb127b2177e734933e16385f37000aa3.tar.gz chromium_src-18c5147cfb127b2177e734933e16385f37000aa3.tar.bz2 | |
Revert 212778 "Colors shouldn't break runs and should be handled..."
> Colors shouldn't break runs and should be handled while drawing the text
>
> BUG=262119,256908
> TEST=In a views textfield, selecting half of a ligature shouldn't break the ligature. See http://www.catch22.net/tuts/uniscribe-mysteries in Firefox to see a example of how it used to look versus how it is supposed to look.
> TBR=asvitkine@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/19672006
TBR=ckocagil@chromium.org
Review URL: https://codereview.chromium.org/19861004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/break_list.h')
| -rw-r--r-- | ui/gfx/break_list.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ui/gfx/break_list.h b/ui/gfx/break_list.h index 770386e..c380222 100644 --- a/ui/gfx/break_list.h +++ b/ui/gfx/break_list.h @@ -47,7 +47,6 @@ class BreakList { // Get the break applicable to |position| (at or preceeding |position|). typename std::vector<Break>::iterator GetBreak(size_t position); - typename std::vector<Break>::const_iterator GetBreak(size_t position) const; // Get the range of the supplied break; returns the break's start position and // the next break's start position (or |max_| for the terminal break). @@ -127,14 +126,6 @@ typename std::vector<std::pair<size_t, T> >::iterator BreakList<T>::GetBreak( } template<class T> -typename std::vector<std::pair<size_t, T> >::const_iterator - BreakList<T>::GetBreak(size_t position) const { - typename std::vector<Break>::const_iterator i = breaks_.end() - 1; - for (; i != breaks_.begin() && i->first > position; --i); - return i; -} - -template<class T> ui::Range BreakList<T>::GetRange( const typename BreakList<T>::const_iterator& i) const { const typename BreakList<T>::const_iterator next = i + 1; |