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

Side by Side Diff: sky/engine/core/rendering/InlineIterator.h

Issue 700703002: Remove more float machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/editing/markup.cpp ('k') | sky/engine/core/rendering/RenderBlock.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) 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 169 }
170 170
171 // Otherwise we pop any embed/override character we added when we opened thi s tag. 171 // Otherwise we pop any embed/override character we added when we opened thi s tag.
172 if (!observer->inIsolate()) 172 if (!observer->inIsolate())
173 observer->embed(WTF::Unicode::PopDirectionalFormat, FromStyleOrDOM); 173 observer->embed(WTF::Unicode::PopDirectionalFormat, FromStyleOrDOM);
174 } 174 }
175 175
176 static inline bool isIteratorTarget(RenderObject* object) 176 static inline bool isIteratorTarget(RenderObject* object)
177 { 177 {
178 ASSERT(object); // The iterator will of course return 0, but its not an expe cted argument to this function. 178 ASSERT(object); // The iterator will of course return 0, but its not an expe cted argument to this function.
179 return object->isText() || object->isFloating() || object->isOutOfFlowPositi oned() || object->isReplaced(); 179 return object->isText() || object->isOutOfFlowPositioned() || object->isRepl aced();
180 } 180 }
181 181
182 // This enum is only used for bidiNextShared() 182 // This enum is only used for bidiNextShared()
183 enum EmptyInlineBehavior { 183 enum EmptyInlineBehavior {
184 SkipEmptyInlines, 184 SkipEmptyInlines,
185 IncludeEmptyInlines, 185 IncludeEmptyInlines,
186 }; 186 };
187 187
188 static bool isEmptyInline(RenderObject* object) 188 static bool isEmptyInline(RenderObject* object)
189 { 189 {
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 m_sor = m_eor; 719 m_sor = m_eor;
720 } 720 }
721 721
722 m_direction = WTF::Unicode::OtherNeutral; 722 m_direction = WTF::Unicode::OtherNeutral;
723 m_status.eor = WTF::Unicode::OtherNeutral; 723 m_status.eor = WTF::Unicode::OtherNeutral;
724 } 724 }
725 725
726 } 726 }
727 727
728 #endif // InlineIterator_h 728 #endif // InlineIterator_h
OLDNEW
« no previous file with comments | « sky/engine/core/editing/markup.cpp ('k') | sky/engine/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698