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

Side by Side Diff: Source/core/rendering/InlineIterator.h

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. 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 | Annotate | Revision Log
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 return dir == RTL ? RightToLeftEmbedding : LeftToRightEmbedding; 126 return dir == RTL ? RightToLeftEmbedding : LeftToRightEmbedding;
127 return dir == RTL ? RightToLeftOverride : LeftToRightOverride; 127 return dir == RTL ? RightToLeftOverride : LeftToRightOverride;
128 } 128 }
129 129
130 template <class Observer> 130 template <class Observer>
131 static inline void notifyObserverEnteredObject(Observer* observer, RenderObject* object) 131 static inline void notifyObserverEnteredObject(Observer* observer, RenderObject* object)
132 { 132 {
133 if (!observer || !object || !object->isRenderInline()) 133 if (!observer || !object || !object->isRenderInline())
134 return; 134 return;
135 135
136 RenderStyle* style = object->style(); 136 const RenderStyle* style = object->style();
137 EUnicodeBidi unicodeBidi = style->unicodeBidi(); 137 EUnicodeBidi unicodeBidi = style->unicodeBidi();
138 if (unicodeBidi == UBNormal) { 138 if (unicodeBidi == UBNormal) {
139 // http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi 139 // http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi
140 // "The element does not open an additional level of embedding with resp ect to the bidirectional algorithm." 140 // "The element does not open an additional level of embedding with resp ect to the bidirectional algorithm."
141 // Thus we ignore any possible dir= attribute on the span. 141 // Thus we ignore any possible dir= attribute on the span.
142 return; 142 return;
143 } 143 }
144 if (isIsolated(unicodeBidi)) { 144 if (isIsolated(unicodeBidi)) {
145 // Make sure that explicit embeddings are committed before we enter the isolated content. 145 // Make sure that explicit embeddings are committed before we enter the isolated content.
146 observer->commitExplicitEmbedding(observer->runs()); 146 observer->commitExplicitEmbedding(observer->runs());
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 m_sor = m_eor; 736 m_sor = m_eor;
737 } 737 }
738 738
739 m_direction = WTF::Unicode::OtherNeutral; 739 m_direction = WTF::Unicode::OtherNeutral;
740 m_status.eor = WTF::Unicode::OtherNeutral; 740 m_status.eor = WTF::Unicode::OtherNeutral;
741 } 741 }
742 742
743 } 743 }
744 744
745 #endif // InlineIterator_h 745 #endif // InlineIterator_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698