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

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

Issue 2622623003: Moved -webkit-rtl-ordering to be generated in ComputedStyleBase. (Closed)
Patch Set: Created 3 years, 11 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. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc.
4 * All right reserved. 4 * All right reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 using namespace WTF::Unicode; 148 using namespace WTF::Unicode;
149 if (unicodeBidi == Embed) { 149 if (unicodeBidi == Embed) {
150 return dir == TextDirection::kRtl ? RightToLeftEmbedding 150 return dir == TextDirection::kRtl ? RightToLeftEmbedding
151 : LeftToRightEmbedding; 151 : LeftToRightEmbedding;
152 } 152 }
153 return dir == TextDirection::kRtl ? RightToLeftOverride : LeftToRightOverride; 153 return dir == TextDirection::kRtl ? RightToLeftOverride : LeftToRightOverride;
154 } 154 }
155 155
156 static inline bool treatAsIsolated(const ComputedStyle& style) { 156 static inline bool treatAsIsolated(const ComputedStyle& style) {
157 return isIsolated(style.unicodeBidi()) && 157 return isIsolated(style.unicodeBidi()) &&
158 style.rtlOrdering() == EOrder::Logical; 158 style.rtlOrdering() == EOrder::kLogical;
159 } 159 }
160 160
161 template <class Observer> 161 template <class Observer>
162 static inline void notifyObserverEnteredObject(Observer* observer, 162 static inline void notifyObserverEnteredObject(Observer* observer,
163 LineLayoutItem object) { 163 LineLayoutItem object) {
164 if (!observer || !object || !object.isLayoutInline()) 164 if (!observer || !object || !object.isLayoutInline())
165 return; 165 return;
166 166
167 const ComputedStyle& style = object.styleRef(); 167 const ComputedStyle& style = object.styleRef();
168 EUnicodeBidi unicodeBidi = style.unicodeBidi(); 168 EUnicodeBidi unicodeBidi = style.unicodeBidi();
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 m_sor = m_eor; 895 m_sor = m_eor;
896 } 896 }
897 897
898 m_direction = WTF::Unicode::OtherNeutral; 898 m_direction = WTF::Unicode::OtherNeutral;
899 m_status.eor = WTF::Unicode::OtherNeutral; 899 m_status.eor = WTF::Unicode::OtherNeutral;
900 } 900 }
901 901
902 } // namespace blink 902 } // namespace blink
903 903
904 #endif // InlineIterator_h 904 #endif // InlineIterator_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698