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

Side by Side Diff: Source/core/layout/line/InlineIterator.h

Issue 1119663002: Making Unicode character names consistent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase patch Created 5 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 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. All right r eserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. All right r eserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights 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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 if (inIsolate() && inEndOfLine) { 448 if (inIsolate() && inEndOfLine) {
449 m_current.moveTo(m_current.object(), end.offset(), m_current.nextBreakab lePosition()); 449 m_current.moveTo(m_current.object(), end.offset(), m_current.nextBreakab lePosition());
450 m_last = m_current; 450 m_last = m_current;
451 updateStatusLastFromCurrentDirection(WTF::Unicode::OtherNeutral); 451 updateStatusLastFromCurrentDirection(WTF::Unicode::OtherNeutral);
452 } 452 }
453 return inEndOfLine; 453 return inEndOfLine;
454 } 454 }
455 455
456 static inline bool isCollapsibleSpace(UChar character, LayoutText* layoutObject) 456 static inline bool isCollapsibleSpace(UChar character, LayoutText* layoutObject)
457 { 457 {
458 if (character == ' ' || character == '\t' || character == softHyphen) 458 if (character == ' ' || character == '\t' || character == softHyphenCharacte r)
459 return true; 459 return true;
460 if (character == '\n') 460 if (character == '\n')
461 return !layoutObject->style()->preserveNewline(); 461 return !layoutObject->style()->preserveNewline();
462 return false; 462 return false;
463 } 463 }
464 464
465 template <typename CharacterType> 465 template <typename CharacterType>
466 static inline int findFirstTrailingSpace(LayoutText* lastText, const CharacterTy pe* characters, int start, int stop) 466 static inline int findFirstTrailingSpace(LayoutText* lastText, const CharacterTy pe* characters, int start, int stop)
467 { 467 {
468 int firstSpace = stop; 468 int firstSpace = stop;
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 m_sor = m_eor; 737 m_sor = m_eor;
738 } 738 }
739 739
740 m_direction = WTF::Unicode::OtherNeutral; 740 m_direction = WTF::Unicode::OtherNeutral;
741 m_status.eor = WTF::Unicode::OtherNeutral; 741 m_status.eor = WTF::Unicode::OtherNeutral;
742 } 742 }
743 743
744 } 744 }
745 745
746 #endif // InlineIterator_h 746 #endif // InlineIterator_h
OLDNEW
« no previous file with comments | « Source/core/layout/line/BreakingContextInlineHeaders.h ('k') | Source/core/paint/TextPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698