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

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

Issue 2046863006: Dirty line boxes correctly when a float gets layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@618230
Patch Set: Updated Created 4 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) 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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 LayoutUnit logicalLeftFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit f ixedOffset, LayoutUnit logicalHeight) const; 387 LayoutUnit logicalLeftFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit f ixedOffset, LayoutUnit logicalHeight) const;
388 388
389 LayoutUnit logicalRightOffsetForPositioningFloat(LayoutUnit logicalTop, Layo utUnit fixedOffset, LayoutUnit* heightRemaining) const; 389 LayoutUnit logicalRightOffsetForPositioningFloat(LayoutUnit logicalTop, Layo utUnit fixedOffset, LayoutUnit* heightRemaining) const;
390 LayoutUnit logicalLeftOffsetForPositioningFloat(LayoutUnit logicalTop, Layou tUnit fixedOffset, LayoutUnit* heightRemaining) const; 390 LayoutUnit logicalLeftOffsetForPositioningFloat(LayoutUnit logicalTop, Layou tUnit fixedOffset, LayoutUnit* heightRemaining) const;
391 391
392 LayoutUnit adjustLogicalRightOffsetForLine(LayoutUnit offsetFromFloats, Inde ntTextOrNot applyTextIndent) const; 392 LayoutUnit adjustLogicalRightOffsetForLine(LayoutUnit offsetFromFloats, Inde ntTextOrNot applyTextIndent) const;
393 LayoutUnit adjustLogicalLeftOffsetForLine(LayoutUnit offsetFromFloats, Inden tTextOrNot applyTextIndent) const; 393 LayoutUnit adjustLogicalLeftOffsetForLine(LayoutUnit offsetFromFloats, Inden tTextOrNot applyTextIndent) const;
394 394
395 virtual RootInlineBox* createRootInlineBox(); // Subclassed by SVG 395 virtual RootInlineBox* createRootInlineBox(); // Subclassed by SVG
396 396
397 void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dir tyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); } 397 void dirtyLinesFromChangedChild(LayoutObject* child, MarkingBehavior marking Behaviour = MarkContainerChain) final { m_lineBoxes.dirtyLinesFromChangedChild(L ineLayoutItem(this), LineLayoutItem(child), markingBehaviour == MarkContainerCha in); }
398 398
399 bool isPagedOverflow(const ComputedStyle&); 399 bool isPagedOverflow(const ComputedStyle&);
400 400
401 enum FlowThreadType { 401 enum FlowThreadType {
402 NoFlowThread, 402 NoFlowThread,
403 MultiColumnFlowThread, 403 MultiColumnFlowThread,
404 PagedFlowThread 404 PagedFlowThread
405 }; 405 };
406 406
407 FlowThreadType getFlowThreadType(const ComputedStyle&); 407 FlowThreadType getFlowThreadType(const ComputedStyle&);
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 662
663 // END METHODS DEFINED IN LayoutBlockFlowLine 663 // END METHODS DEFINED IN LayoutBlockFlowLine
664 664
665 }; 665 };
666 666
667 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 667 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
668 668
669 } // namespace blink 669 } // namespace blink
670 670
671 #endif // LayoutBlockFlow_h 671 #endif // LayoutBlockFlow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698