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

Side by Side Diff: Source/core/layout/TextAutosizer.cpp

Issue 1158183006: Remove the old multicol implementation. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase master Created 5 years, 6 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
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/layout/svg/LayoutSVGText.cpp » ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 { 165 {
166 ASSERT(isPotentialClusterRoot(layoutObject)); 166 ASSERT(isPotentialClusterRoot(layoutObject));
167 167
168 LayoutBlock* containingBlock = layoutObject->containingBlock(); 168 LayoutBlock* containingBlock = layoutObject->containingBlock();
169 return layoutObject->isLayoutView() 169 return layoutObject->isLayoutView()
170 || layoutObject->isFloating() 170 || layoutObject->isFloating()
171 || layoutObject->isOutOfFlowPositioned() 171 || layoutObject->isOutOfFlowPositioned()
172 || layoutObject->isTableCell() 172 || layoutObject->isTableCell()
173 || layoutObject->isTableCaption() 173 || layoutObject->isTableCaption()
174 || layoutObject->isFlexibleBoxIncludingDeprecated() 174 || layoutObject->isFlexibleBoxIncludingDeprecated()
175 || layoutObject->hasColumns()
176 || (containingBlock && containingBlock->isHorizontalWritingMode() != lay outObject->isHorizontalWritingMode()) 175 || (containingBlock && containingBlock->isHorizontalWritingMode() != lay outObject->isHorizontalWritingMode())
177 || layoutObject->style()->isDisplayReplacedType() 176 || layoutObject->style()->isDisplayReplacedType()
178 || layoutObject->isTextArea() 177 || layoutObject->isTextArea()
179 || layoutObject->style()->userModify() != READ_ONLY; 178 || layoutObject->style()->userModify() != READ_ONLY;
180 } 179 }
181 180
182 static bool blockIsRowOfLinks(const LayoutBlock* block) 181 static bool blockIsRowOfLinks(const LayoutBlock* block)
183 { 182 {
184 // A "row of links" is a block for which: 183 // A "row of links" is a block for which:
185 // 1. It does not contain non-link text elements longer than 3 characters 184 // 1. It does not contain non-link text elements longer than 3 characters
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 } 1168 }
1170 return computedSize; 1169 return computedSize;
1171 } 1170 }
1172 1171
1173 DEFINE_TRACE(TextAutosizer) 1172 DEFINE_TRACE(TextAutosizer)
1174 { 1173 {
1175 visitor->trace(m_document); 1174 visitor->trace(m_document);
1176 } 1175 }
1177 1176
1178 } // namespace blink 1177 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/layout/svg/LayoutSVGText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698