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

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

Issue 2940933003: DO NOT SUBMIT results of new clang-format (Closed)
Patch Set: Created 3 years, 6 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 * 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 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 LayoutTextInfo layout_text_info; 1111 LayoutTextInfo layout_text_info;
1112 VerticalPositionCache vertical_position_cache; 1112 VerticalPositionCache vertical_position_cache;
1113 1113
1114 // Pagination may require us to delete and re-create a line due to floats. 1114 // Pagination may require us to delete and re-create a line due to floats.
1115 // When this happens, 1115 // When this happens,
1116 // we need to store the pagination strut in the meantime. 1116 // we need to store the pagination strut in the meantime.
1117 LayoutUnit pagination_strut_from_deleted_line; 1117 LayoutUnit pagination_strut_from_deleted_line;
1118 1118
1119 LineBreaker line_breaker(LineLayoutBlockFlow(this)); 1119 LineBreaker line_breaker(LineLayoutBlockFlow(this));
1120 1120
1121
1122 while (!end_of_line.AtEnd()) { 1121 while (!end_of_line.AtEnd()) {
1123 // The runs from the previous line should have been cleaned up. 1122 // The runs from the previous line should have been cleaned up.
1124 DCHECK(!resolver.Runs().RunCount()); 1123 DCHECK(!resolver.Runs().RunCount());
1125 1124
1126 // FIXME: Is this check necessary before the first iteration or can it be 1125 // FIXME: Is this check necessary before the first iteration or can it be
1127 // moved to the end? 1126 // moved to the end?
1128 if (layout_state.EndLine()) { 1127 if (layout_state.EndLine()) {
1129 layout_state.SetEndLineMatched(layout_state.EndLineMatched() || 1128 layout_state.SetEndLineMatched(layout_state.EndLineMatched() ||
1130 MatchedEndLine(layout_state, resolver, 1129 MatchedEndLine(layout_state, resolver,
1131 clean_line_start, 1130 clean_line_start,
(...skipping 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after
2654 2653
2655 bool LayoutBlockFlow::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const { 2654 bool LayoutBlockFlow::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const {
2656 // LayoutBlockFlow is in charge of paint invalidation of the first line. 2655 // LayoutBlockFlow is in charge of paint invalidation of the first line.
2657 if (FirstLineBox()) 2656 if (FirstLineBox())
2658 return false; 2657 return false;
2659 2658
2660 return LayoutBlock::PaintedOutputOfObjectHasNoEffectRegardlessOfSize(); 2659 return LayoutBlock::PaintedOutputOfObjectHasNoEffectRegardlessOfSize();
2661 } 2660 }
2662 2661
2663 } // namespace blink 2662 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698