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

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

Issue 1298603004: Ensure floats get added to floating objects list even if they don't have a linebox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 5 years, 4 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 | Annotate | Revision Log
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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 LayoutUnit& availableLogicalWidth, BidiRun* firstRun, BidiRun* trailingS paceRun, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache &, WordMeasurements&); 522 LayoutUnit& availableLogicalWidth, BidiRun* firstRun, BidiRun* trailingS paceRun, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache &, WordMeasurements&);
523 void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOv erflowAndFallbackFontsMap&, VerticalPositionCache&); 523 void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOv erflowAndFallbackFontsMap&, VerticalPositionCache&);
524 void appendFloatingObjectToLastLine(FloatingObject&); 524 void appendFloatingObjectToLastLine(FloatingObject&);
525 // Helper function for layoutInlineChildren() 525 // Helper function for layoutInlineChildren()
526 RootInlineBox* createLineBoxesFromBidiRuns(unsigned bidiLevel, BidiRunList<B idiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun, WordMeasurements&); 526 RootInlineBox* createLineBoxesFromBidiRuns(unsigned bidiLevel, BidiRunList<B idiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun, WordMeasurements&);
527 void layoutRunsAndFloats(LineLayoutState&); 527 void layoutRunsAndFloats(LineLayoutState&);
528 const InlineIterator& restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogica lHeight, LayoutUnit newLogicalHeight, FloatingObject* lastFloatFromPreviousLine , InlineBidiResolver&, const InlineIterator&); 528 const InlineIterator& restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogica lHeight, LayoutUnit newLogicalHeight, FloatingObject* lastFloatFromPreviousLine , InlineBidiResolver&, const InlineIterator&);
529 void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, 529 void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&,
530 const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiSta tus); 530 const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiSta tus);
531 void linkToEndLineIfNeeded(LineLayoutState&); 531 void linkToEndLineIfNeeded(LineLayoutState&);
532 static void markDirtyFloatsForPaintInvalidation(Vector<FloatWithRect>& float s); 532 void markDirtyFloatsForPaintInvalidation(Vector<FloatWithRect>& floats);
533 RootInlineBox* determineStartPosition(LineLayoutState&, InlineBidiResolver&) ; 533 RootInlineBox* determineStartPosition(LineLayoutState&, InlineBidiResolver&) ;
534 void determineEndPosition(LineLayoutState&, RootInlineBox* startBox, InlineI terator& cleanLineStart, BidiStatus& cleanLineBidiStatus); 534 void determineEndPosition(LineLayoutState&, RootInlineBox* startBox, InlineI terator& cleanLineStart, BidiStatus& cleanLineBidiStatus);
535 bool lineBoxHasBRWithClearance(RootInlineBox*); 535 bool lineBoxHasBRWithClearance(RootInlineBox*);
536 bool checkPaginationAndFloatsAtEndLine(LineLayoutState&); 536 bool checkPaginationAndFloatsAtEndLine(LineLayoutState&);
537 bool matchedEndLine(LineLayoutState&, const InlineBidiResolver&, const Inlin eIterator& endLineStart, const BidiStatus& endLineStatus); 537 bool matchedEndLine(LineLayoutState&, const InlineBidiResolver&, const Inlin eIterator& endLineStart, const BidiStatus& endLineStatus);
538 void deleteEllipsisLineBoxes(); 538 void deleteEllipsisLineBoxes();
539 void checkLinesForTextOverflow(); 539 void checkLinesForTextOverflow();
540 // Positions new floats and also adjust all floats encountered on the line i f any of them 540 // Positions new floats and also adjust all floats encountered on the line i f any of them
541 // have to move to the next page/column. 541 // have to move to the next page/column.
542 void positionDialog(); 542 void positionDialog();
543 543
544 // END METHODS DEFINED IN LayoutBlockFlowLine 544 // END METHODS DEFINED IN LayoutBlockFlowLine
545 545
546 }; 546 };
547 547
548 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 548 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
549 549
550 } // namespace blink 550 } // namespace blink
551 551
552 #endif // LayoutBlockFlow_h 552 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/block/float/trailing-float-layout-expected.txt ('k') | Source/core/layout/LayoutBlockFlowLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698