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

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

Issue 2840443003: Allow forced breaks inside floats. (Closed)
Patch Set: Created 3 years, 7 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/fragmentation/forced-break-inside-float.html ('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 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2254 matching lines...) Expand 10 before | Expand all | Expand 10 after
2265 return true; 2265 return true;
2266 bool is_multicol_value = break_value == EBreakBetween::kColumn || 2266 bool is_multicol_value = break_value == EBreakBetween::kColumn ||
2267 break_value == EBreakBetween::kAvoidColumn; 2267 break_value == EBreakBetween::kAvoidColumn;
2268 if (ToLayoutFlowThread(curr)->IsLayoutPagedFlowThread()) 2268 if (ToLayoutFlowThread(curr)->IsLayoutPagedFlowThread())
2269 return !is_multicol_value; 2269 return !is_multicol_value;
2270 if (is_multicol_value) 2270 if (is_multicol_value)
2271 return true; 2271 return true;
2272 // If this is a flow thread for a multicol container, and we have a break 2272 // If this is a flow thread for a multicol container, and we have a break
2273 // value for paged, we need to keep looking. 2273 // value for paged, we need to keep looking.
2274 } 2274 }
2275 if (curr->IsFloatingOrOutOfFlowPositioned()) 2275 if (curr->IsOutOfFlowPositioned())
2276 return false; 2276 return false;
2277 curr = curr->ContainingBlock(); 2277 curr = curr->ContainingBlock();
2278 } 2278 }
2279 NOTREACHED(); 2279 NOTREACHED();
2280 return false; 2280 return false;
2281 } 2281 }
2282 2282
2283 bool LayoutBox::IsBreakInsideControllable(EBreakInside break_value) const { 2283 bool LayoutBox::IsBreakInsideControllable(EBreakInside break_value) const {
2284 if (break_value == EBreakInside::kAuto) 2284 if (break_value == EBreakInside::kAuto)
2285 return true; 2285 return true;
(...skipping 3614 matching lines...) Expand 10 before | Expand all | Expand 10 after
5900 void LayoutBox::MutableForPainting:: 5900 void LayoutBox::MutableForPainting::
5901 SavePreviousContentBoxSizeAndLayoutOverflowRect() { 5901 SavePreviousContentBoxSizeAndLayoutOverflowRect() {
5902 auto& rare_data = GetLayoutBox().EnsureRareData(); 5902 auto& rare_data = GetLayoutBox().EnsureRareData();
5903 rare_data.has_previous_content_box_size_and_layout_overflow_rect_ = true; 5903 rare_data.has_previous_content_box_size_and_layout_overflow_rect_ = true;
5904 rare_data.previous_content_box_size_ = GetLayoutBox().ContentBoxRect().Size(); 5904 rare_data.previous_content_box_size_ = GetLayoutBox().ContentBoxRect().Size();
5905 rare_data.previous_layout_overflow_rect_ = 5905 rare_data.previous_layout_overflow_rect_ =
5906 GetLayoutBox().LayoutOverflowRect(); 5906 GetLayoutBox().LayoutOverflowRect();
5907 } 5907 }
5908 5908
5909 } // namespace blink 5909 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fragmentation/forced-break-inside-float.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698