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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 1970183002: Don't use canCollapseAnonymousBlockChild() to determine whether to truncate text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Declaration soup - aka LayoutTest. Created 4 years, 7 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after
1914 { 1914 {
1915 const LayoutBlock* firstLineBlock = this; 1915 const LayoutBlock* firstLineBlock = this;
1916 bool hasPseudo = false; 1916 bool hasPseudo = false;
1917 while (true) { 1917 while (true) {
1918 hasPseudo = firstLineBlock->style()->hasPseudoStyle(PseudoIdFirstLine); 1918 hasPseudo = firstLineBlock->style()->hasPseudoStyle(PseudoIdFirstLine);
1919 if (hasPseudo) 1919 if (hasPseudo)
1920 break; 1920 break;
1921 LayoutObject* parentBlock = firstLineBlock->parent(); 1921 LayoutObject* parentBlock = firstLineBlock->parent();
1922 if (firstLineBlock->isAtomicInlineLevel() || firstLineBlock->isFloatingO rOutOfFlowPositioned() 1922 if (firstLineBlock->isAtomicInlineLevel() || firstLineBlock->isFloatingO rOutOfFlowPositioned()
1923 || !parentBlock 1923 || !parentBlock
1924 || !parentBlock->canHaveFirstLineOrFirstLetterStyle()) 1924 || !parentBlock->behavesLikeBlockContainer())
1925 break; 1925 break;
1926 ASSERT_WITH_SECURITY_IMPLICATION(parentBlock->isLayoutBlock()); 1926 ASSERT_WITH_SECURITY_IMPLICATION(parentBlock->isLayoutBlock());
1927 if (toLayoutBlock(parentBlock)->firstChild() != firstLineBlock) 1927 if (toLayoutBlock(parentBlock)->firstChild() != firstLineBlock)
1928 break; 1928 break;
1929 firstLineBlock = toLayoutBlock(parentBlock); 1929 firstLineBlock = toLayoutBlock(parentBlock);
1930 } 1930 }
1931 1931
1932 if (!hasPseudo) 1932 if (!hasPseudo)
1933 return nullptr; 1933 return nullptr;
1934 1934
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
2243 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) { 2243 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) {
2244 LayoutBox* currBox = *it; 2244 LayoutBox* currBox = *it;
2245 ASSERT(!currBox->needsLayout()); 2245 ASSERT(!currBox->needsLayout());
2246 } 2246 }
2247 } 2247 }
2248 } 2248 }
2249 2249
2250 #endif 2250 #endif
2251 2251
2252 } // namespace blink 2252 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698