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

Side by Side Diff: WebCore/rendering/InlineFlowBox.cpp

Issue 3692003: Merge 69345 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 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) 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 m_firstChild = child; 75 m_firstChild = child;
76 m_lastChild = child; 76 m_lastChild = child;
77 } else { 77 } else {
78 m_lastChild->setNextOnLine(child); 78 m_lastChild->setNextOnLine(child);
79 child->setPrevOnLine(m_lastChild); 79 child->setPrevOnLine(m_lastChild);
80 m_lastChild = child; 80 m_lastChild = child;
81 } 81 }
82 child->setFirstLineStyleBit(m_firstLine); 82 child->setFirstLineStyleBit(m_firstLine);
83 if (child->isText()) 83 if (child->isText())
84 m_hasTextChildren = true; 84 m_hasTextChildren = true;
85 if (child->renderer()->selectionState() != RenderObject::SelectionNone)
86 root()->setHasSelectedChildren(true);
87 85
88 checkConsistency(); 86 checkConsistency();
89 } 87 }
90 88
91 void InlineFlowBox::removeChild(InlineBox* child) 89 void InlineFlowBox::removeChild(InlineBox* child)
92 { 90 {
93 checkConsistency(); 91 checkConsistency();
94 92
95 if (!m_dirty) 93 if (!m_dirty)
96 dirtyLineBoxes(); 94 dirtyLineBoxes();
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 ASSERT(child->prevOnLine() == prev); 1131 ASSERT(child->prevOnLine() == prev);
1134 prev = child; 1132 prev = child;
1135 } 1133 }
1136 ASSERT(prev == m_lastChild); 1134 ASSERT(prev == m_lastChild);
1137 #endif 1135 #endif
1138 } 1136 }
1139 1137
1140 #endif 1138 #endif
1141 1139
1142 } // namespace WebCore 1140 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698