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

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

Issue 2610253004: Migrate WTF::Vector::append() to ::push_back() [part 9 of N] (Closed)
Patch Set: rebase Created 3 years, 11 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) 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 472
473 // If we're ignoring spaces, we have to stop and include this object and 473 // If we're ignoring spaces, we have to stop and include this object and
474 // then start ignoring spaces again. 474 // then start ignoring spaces again.
475 bool containerIsInline = box.container().isLayoutInline(); 475 bool containerIsInline = box.container().isLayoutInline();
476 if (isInlineType || containerIsInline) { 476 if (isInlineType || containerIsInline) {
477 if (m_ignoringSpaces) 477 if (m_ignoringSpaces)
478 ensureLineBoxInsideIgnoredSpaces(&m_lineMidpointState, box); 478 ensureLineBoxInsideIgnoredSpaces(&m_lineMidpointState, box);
479 m_trailingObjects.appendObjectIfNeeded(box); 479 m_trailingObjects.appendObjectIfNeeded(box);
480 } 480 }
481 if (!containerIsInline) 481 if (!containerIsInline)
482 positionedObjects.append(box); 482 positionedObjects.push_back(box);
483 m_width.addUncommittedWidth( 483 m_width.addUncommittedWidth(
484 inlineLogicalWidthFromAncestorsIfNeeded(box).toFloat()); 484 inlineLogicalWidthFromAncestorsIfNeeded(box).toFloat());
485 // Reset prior line break context characters. 485 // Reset prior line break context characters.
486 m_layoutTextInfo.m_lineBreakIterator.resetPriorContext(); 486 m_layoutTextInfo.m_lineBreakIterator.resetPriorContext();
487 } 487 }
488 488
489 inline void BreakingContext::handleFloat() { 489 inline void BreakingContext::handleFloat() {
490 LineLayoutBox floatBox(m_current.getLineLayoutItem()); 490 LineLayoutBox floatBox(m_current.getLineLayoutItem());
491 FloatingObject* floatingObject = m_block.insertFloatingObject(floatBox); 491 FloatingObject* floatingObject = m_block.insertFloatingObject(floatBox);
492 492
(...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 1542
1543 if (style.getTextIndentType() == TextIndentHanging) 1543 if (style.getTextIndentType() == TextIndentHanging)
1544 indentText = indentText == IndentText ? DoNotIndentText : IndentText; 1544 indentText = indentText == IndentText ? DoNotIndentText : IndentText;
1545 1545
1546 return indentText; 1546 return indentText;
1547 } 1547 }
1548 1548
1549 } // namespace blink 1549 } // namespace blink
1550 1550
1551 #endif // BreakingContextInlineHeaders_h 1551 #endif // BreakingContextInlineHeaders_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698