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

Side by Side Diff: Source/core/rendering/InlineFlowBox.cpp

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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
« no previous file with comments | « Source/core/rendering/InlineBox.cpp ('k') | Source/core/rendering/RenderBR.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) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 child->setParent(this); 99 child->setParent(this);
100 if (!m_firstChild) { 100 if (!m_firstChild) {
101 m_firstChild = child; 101 m_firstChild = child;
102 m_lastChild = child; 102 m_lastChild = child;
103 } else { 103 } else {
104 m_lastChild->setNextOnLine(child); 104 m_lastChild->setNextOnLine(child);
105 child->setPrevOnLine(m_lastChild); 105 child->setPrevOnLine(m_lastChild);
106 m_lastChild = child; 106 m_lastChild = child;
107 } 107 }
108 child->setFirstLineStyleBit(isFirstLineStyle()); 108 child->setFirstLineStyleBit(isFirstLineStyle() == FirstLineStyle);
109 child->setIsHorizontal(isHorizontal()); 109 child->setIsHorizontal(isHorizontal());
110 if (child->isText()) { 110 if (child->isText()) {
111 if (child->renderer().parent() == renderer()) 111 if (child->renderer().parent() == renderer())
112 m_hasTextChildren = true; 112 m_hasTextChildren = true;
113 setHasTextDescendantsOnAncestors(this); 113 setHasTextDescendantsOnAncestors(this);
114 } else if (child->isInlineFlowBox()) { 114 } else if (child->isInlineFlowBox()) {
115 if (toInlineFlowBox(child)->hasTextDescendants()) 115 if (toInlineFlowBox(child)->hasTextDescendants())
116 setHasTextDescendantsOnAncestors(this); 116 setHasTextDescendantsOnAncestors(this);
117 } 117 }
118 118
(...skipping 1543 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 ASSERT(child->prevOnLine() == prev); 1662 ASSERT(child->prevOnLine() == prev);
1663 prev = child; 1663 prev = child;
1664 } 1664 }
1665 ASSERT(prev == m_lastChild); 1665 ASSERT(prev == m_lastChild);
1666 #endif 1666 #endif
1667 } 1667 }
1668 1668
1669 #endif 1669 #endif
1670 1670
1671 } // namespace WebCore 1671 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineBox.cpp ('k') | Source/core/rendering/RenderBR.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698