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

Side by Side Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 150653006: Remove the Vector::append overload that takes a Vector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 10 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. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 // rniwa says previousLineBrokeCleanly is just a WinIE hack and could al ways be false here? 838 // rniwa says previousLineBrokeCleanly is just a WinIE hack and could al ways be false here?
839 isolatedResolver.createBidiRunsForLine(endOfRuns, NoVisualOverride, prev iousLineBrokeCleanly); 839 isolatedResolver.createBidiRunsForLine(endOfRuns, NoVisualOverride, prev iousLineBrokeCleanly);
840 840
841 ASSERT(isolatedResolver.runs().runCount()); 841 ASSERT(isolatedResolver.runs().runCount());
842 if (isolatedResolver.runs().runCount()) 842 if (isolatedResolver.runs().runCount())
843 bidiRuns.replaceRunWithRuns(isolatedRun, isolatedResolver.runs()); 843 bidiRuns.replaceRunWithRuns(isolatedRun, isolatedResolver.runs());
844 844
845 // If we encountered any nested isolate runs, just move them 845 // If we encountered any nested isolate runs, just move them
846 // to the top resolver's list for later processing. 846 // to the top resolver's list for later processing.
847 if (!isolatedResolver.isolatedRuns().isEmpty()) { 847 if (!isolatedResolver.isolatedRuns().isEmpty()) {
848 topResolver.isolatedRuns().append(isolatedResolver.isolatedRuns()); 848 topResolver.isolatedRuns().appendVector(isolatedResolver.isolatedRun s());
849 currentRoot = isolatedInline; 849 currentRoot = isolatedInline;
850 restoreIsolatedMidpointStates(topResolver, isolatedResolver); 850 restoreIsolatedMidpointStates(topResolver, isolatedResolver);
851 } 851 }
852 } 852 }
853 } 853 }
854 854
855 static inline bool segmentIsEmpty(const InlineIterator& segmentStart, const Inli neIterator& segmentEnd) 855 static inline bool segmentIsEmpty(const InlineIterator& segmentStart, const Inli neIterator& segmentEnd)
856 { 856 {
857 return segmentStart == segmentEnd; 857 return segmentStart == segmentEnd;
858 } 858 }
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2022 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false); 2022 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false);
2023 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft; 2023 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft;
2024 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0); 2024 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0);
2025 2025
2026 if (!style()->isLeftToRightDirection()) 2026 if (!style()->isLeftToRightDirection())
2027 return logicalWidth() - logicalLeft; 2027 return logicalWidth() - logicalLeft;
2028 return logicalLeft; 2028 return logicalLeft;
2029 } 2029 }
2030 2030
2031 } 2031 }
OLDNEW
« no previous file with comments | « Source/core/html/parser/HTMLFormattingElementList.cpp ('k') | Source/core/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698