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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

Issue 2505943003: Rename positionNewFloats() to placeNewFloats(). (Closed)
Patch Set: Created 4 years, 1 month 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All right reserved. 4 * All right reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights reserved.
6 * Copyright (C) 2013 Adobe Systems Incorporated. 6 * Copyright (C) 2013 Adobe Systems Incorporated.
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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 LineLayoutBox floatBox(m_current.getLineLayoutItem()); 489 LineLayoutBox floatBox(m_current.getLineLayoutItem());
490 FloatingObject* floatingObject = m_block.insertFloatingObject(floatBox); 490 FloatingObject* floatingObject = m_block.insertFloatingObject(floatBox);
491 // Check if it fits in the current line; if it does, position it now, 491 // Check if it fits in the current line; if it does, position it now,
492 // otherwise, position it after moving to next line (in newLine() func). 492 // otherwise, position it after moving to next line (in newLine() func).
493 // FIXME: Bug 110372: Properly position multiple stacked floats with 493 // FIXME: Bug 110372: Properly position multiple stacked floats with
494 // non-rectangular shape outside. 494 // non-rectangular shape outside.
495 if (m_floatsFitOnLine && 495 if (m_floatsFitOnLine &&
496 m_width.fitsOnLine( 496 m_width.fitsOnLine(
497 m_block.logicalWidthForFloat(*floatingObject).toFloat(), 497 m_block.logicalWidthForFloat(*floatingObject).toFloat(),
498 ExcludeWhitespace)) { 498 ExcludeWhitespace)) {
499 m_block.positionNewFloats(m_block.logicalHeight(), &m_width); 499 m_block.placeNewFloats(m_block.logicalHeight(), &m_width);
500 if (m_lineBreak.getLineLayoutItem() == m_current.getLineLayoutItem()) { 500 if (m_lineBreak.getLineLayoutItem() == m_current.getLineLayoutItem()) {
501 ASSERT(!m_lineBreak.offset()); 501 ASSERT(!m_lineBreak.offset());
502 m_lineBreak.increment(); 502 m_lineBreak.increment();
503 } 503 }
504 } else { 504 } else {
505 m_floatsFitOnLine = false; 505 m_floatsFitOnLine = false;
506 } 506 }
507 // Update prior line break context characters, using U+FFFD (OBJECT 507 // Update prior line break context characters, using U+FFFD (OBJECT
508 // REPLACEMENT CHARACTER) for floating element. 508 // REPLACEMENT CHARACTER) for floating element.
509 m_layoutTextInfo.m_lineBreakIterator.updatePriorContext(replacementCharacter); 509 m_layoutTextInfo.m_lineBreakIterator.updatePriorContext(replacementCharacter);
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
1491 1491
1492 if (style.getTextIndentType() == TextIndentHanging) 1492 if (style.getTextIndentType() == TextIndentHanging)
1493 indentText = indentText == IndentText ? DoNotIndentText : IndentText; 1493 indentText = indentText == IndentText ? DoNotIndentText : IndentText;
1494 1494
1495 return indentText; 1495 return indentText;
1496 } 1496 }
1497 1497
1498 } // namespace blink 1498 } // namespace blink
1499 1499
1500 #endif // BreakingContextInlineHeaders_h 1500 #endif // BreakingContextInlineHeaders_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698