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

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

Issue 1121173002: Fix shrink-to-fit when children's writing-mode is orthogonal (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests and test results updated Created 5 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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 592
593 virtual int firstLineBoxBaseline() const { return -1; } 593 virtual int firstLineBoxBaseline() const { return -1; }
594 virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // R eturns -1 if we should skip this box when computing the baseline of an inline-bl ock. 594 virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // R eturns -1 if we should skip this box when computing the baseline of an inline-bl ock.
595 595
596 bool shrinkToAvoidFloats() const; 596 bool shrinkToAvoidFloats() const;
597 virtual bool avoidsFloats() const; 597 virtual bool avoidsFloats() const;
598 598
599 virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&); 599 virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&);
600 600
601 bool isWritingModeRoot() const { return !parent() || parent()->style()->writ ingMode() != style()->writingMode(); } 601 bool isWritingModeRoot() const { return !parent() || parent()->style()->writ ingMode() != style()->writingMode(); }
602 bool isWritingModeOrthogonalToParent() const { return parent() && parent()-> isHorizontalWritingMode() != isHorizontalWritingMode(); }
602 603
603 bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrOutOf FlowPositioned() && parent() && parent()->isDeprecatedFlexibleBox(); } 604 bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrOutOf FlowPositioned() && parent() && parent()->isDeprecatedFlexibleBox(); }
604 bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloati ngOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDepreca ted(); } 605 bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloati ngOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDepreca ted(); }
605 606
606 bool isGridItem() const { return parent() && parent()->isLayoutGrid(); } 607 bool isGridItem() const { return parent() && parent()->isLayoutGrid(); }
607 608
608 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override; 609 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override;
609 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override; 610 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override;
610 611
611 virtual LayoutUnit offsetLeft() const override; 612 virtual LayoutUnit offsetLeft() const override;
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 if (UNLIKELY(inlineBoxWrapper() != 0)) 920 if (UNLIKELY(inlineBoxWrapper() != 0))
920 deleteLineBoxWrapper(); 921 deleteLineBoxWrapper();
921 } 922 }
922 923
923 ensureRareData().m_inlineBoxWrapper = boxWrapper; 924 ensureRareData().m_inlineBoxWrapper = boxWrapper;
924 } 925 }
925 926
926 } // namespace blink 927 } // namespace blink
927 928
928 #endif // LayoutBox_h 929 #endif // LayoutBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698