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

Side by Side Diff: third_party/WebKit/Source/core/dom/Text.cpp

Issue 2757563006: Floats are also out-of-flow considering white-space. (Closed)
Patch Set: Fixed test expectations. Created 3 years, 9 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 | « third_party/WebKit/LayoutTests/platform/win7/fast/css/invalidation-errors-expected.txt ('k') | no next file » | 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) 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
5 * reserved. 5 * reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 unsigned maxSiblingsToVisit = 50; 288 unsigned maxSiblingsToVisit = 50;
289 289
290 const LayoutObject* prev = 290 const LayoutObject* prev =
291 LayoutTreeBuilderTraversal::previousSiblingLayoutObject( 291 LayoutTreeBuilderTraversal::previousSiblingLayoutObject(
292 *this, maxSiblingsToVisit); 292 *this, maxSiblingsToVisit);
293 if (prev && prev->isBR()) // <span><br/> <br/></span> 293 if (prev && prev->isBR()) // <span><br/> <br/></span>
294 return false; 294 return false;
295 295
296 if (parent.isLayoutInline()) { 296 if (parent.isLayoutInline()) {
297 // <span><div/> <div/></span> 297 // <span><div/> <div/></span>
298 if (prev && !prev->isInline() && !prev->isOutOfFlowPositioned()) 298 if (prev && !prev->isInline() && !prev->isFloatingOrOutOfFlowPositioned())
299 return false; 299 return false;
300 } else { 300 } else {
301 if (parent.isLayoutBlock() && !parent.childrenInline() && 301 if (parent.isLayoutBlock() && !parent.childrenInline() &&
302 (!prev || !prev->isInline())) 302 (!prev || !prev->isInline()))
303 return false; 303 return false;
304 304
305 LayoutObject* first = parent.slowFirstChild(); 305 LayoutObject* first = parent.slowFirstChild();
306 for (; first && first->isFloatingOrOutOfFlowPositioned() && 306 for (; first && first->isFloatingOrOutOfFlowPositioned() &&
307 maxSiblingsToVisit; 307 maxSiblingsToVisit;
308 first = first->nextSibling(), --maxSiblingsToVisit) { 308 first = first->nextSibling(), --maxSiblingsToVisit) {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 462
463 Text* Text::cloneWithData(const String& data) { 463 Text* Text::cloneWithData(const String& data) {
464 return create(document(), data); 464 return create(document(), data);
465 } 465 }
466 466
467 DEFINE_TRACE(Text) { 467 DEFINE_TRACE(Text) {
468 CharacterData::trace(visitor); 468 CharacterData::trace(visitor);
469 } 469 }
470 470
471 } // namespace blink 471 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win7/fast/css/invalidation-errors-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698