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

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

Issue 1969203003: Move makeChildrenInlineIfPossible to LayoutBlockFlow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 // Merge children of |siblingThatMayBeDeleted| into this object if possible, and delete 409 // Merge children of |siblingThatMayBeDeleted| into this object if possible, and delete
410 // |siblingThatMayBeDeleted|. Returns true if we were able to merge. In that case, 410 // |siblingThatMayBeDeleted|. Returns true if we were able to merge. In that case,
411 // |siblingThatMayBeDeleted| will be dead. We'll only be able to merge if bo th blocks are 411 // |siblingThatMayBeDeleted| will be dead. We'll only be able to merge if bo th blocks are
412 // anonymous. 412 // anonymous.
413 bool mergeSiblingContiguousAnonymousBlock(LayoutBlockFlow* siblingThatMayBeD eleted); 413 bool mergeSiblingContiguousAnonymousBlock(LayoutBlockFlow* siblingThatMayBeD eleted);
414 414
415 // Reparent subsequent or preceding adjacent floating or out-of-flow sibling s into this object. 415 // Reparent subsequent or preceding adjacent floating or out-of-flow sibling s into this object.
416 void reparentSubsequentFloatingOrOutOfFlowSiblings(); 416 void reparentSubsequentFloatingOrOutOfFlowSiblings();
417 void reparentPrecedingFloatingOrOutOfFlowSiblings(); 417 void reparentPrecedingFloatingOrOutOfFlowSiblings();
418 418
419 void makeChildrenInlineIfPossible();
420
419 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, LayoutUnit& logicalLeft, LayoutUnit& totalLogicalWid th, LayoutUnit& availableLogicalWidth, unsigned expansionOpportunityCount); 421 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, LayoutUnit& logicalLeft, LayoutUnit& totalLogicalWid th, LayoutUnit& availableLogicalWidth, unsigned expansionOpportunityCount);
420 void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bo ol& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight); 422 void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bo ol& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
421 423
422 bool shouldBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData ->m_lineBreakToAvoidWidow >= 0; } 424 bool shouldBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData ->m_lineBreakToAvoidWidow >= 0; }
423 void clearShouldBreakAtLineToAvoidWidow() const; 425 void clearShouldBreakAtLineToAvoidWidow() const;
424 int lineBreakToAvoidWidow() const { return m_rareData ? m_rareData->m_lineBr eakToAvoidWidow : -1; } 426 int lineBreakToAvoidWidow() const { return m_rareData ? m_rareData->m_lineBr eakToAvoidWidow : -1; }
425 void setBreakAtLineToAvoidWidow(int); 427 void setBreakAtLineToAvoidWidow(int);
426 void clearDidBreakAtLineToAvoidWidow(); 428 void clearDidBreakAtLineToAvoidWidow();
427 void setDidBreakAtLineToAvoidWidow(); 429 void setDidBreakAtLineToAvoidWidow();
428 bool didBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m _didBreakAtLineToAvoidWidow; } 430 bool didBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m _didBreakAtLineToAvoidWidow; }
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 649
648 // END METHODS DEFINED IN LayoutBlockFlowLine 650 // END METHODS DEFINED IN LayoutBlockFlowLine
649 651
650 }; 652 };
651 653
652 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 654 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
653 655
654 } // namespace blink 656 } // namespace blink
655 657
656 #endif // LayoutBlockFlow_h 658 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698