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

Side by Side Diff: Source/core/rendering/RenderBox.h

Issue 697653004: [CSS Grid Layout] Grid items must set a new formatting context. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Applied suggested changes. Created 6 years, 1 month 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 bool shrinkToAvoidFloats() const; 523 bool shrinkToAvoidFloats() const;
524 virtual bool avoidsFloats() const; 524 virtual bool avoidsFloats() const;
525 525
526 virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&); 526 virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&);
527 527
528 bool isWritingModeRoot() const { return !parent() || parent()->style()->writ ingMode() != style()->writingMode(); } 528 bool isWritingModeRoot() const { return !parent() || parent()->style()->writ ingMode() != style()->writingMode(); }
529 529
530 bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrOutOf FlowPositioned() && parent() && parent()->isDeprecatedFlexibleBox(); } 530 bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrOutOf FlowPositioned() && parent() && parent()->isDeprecatedFlexibleBox(); }
531 bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloati ngOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDepreca ted(); } 531 bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloati ngOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDepreca ted(); }
532 532
533 bool isGridItem() const { return parent() && parent()->isRenderGrid(); }
534
533 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override; 535 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override;
534 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override; 536 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override;
535 537
536 virtual LayoutUnit offsetLeft() const override; 538 virtual LayoutUnit offsetLeft() const override;
537 virtual LayoutUnit offsetTop() const override; 539 virtual LayoutUnit offsetTop() const override;
538 540
539 LayoutPoint flipForWritingModeForChild(const RenderBox* child, const LayoutP oint&) const; 541 LayoutPoint flipForWritingModeForChild(const RenderBox* child, const LayoutP oint&) const;
540 LayoutUnit flipForWritingMode(LayoutUnit position) const WARN_UNUSED_RETURN 542 LayoutUnit flipForWritingMode(LayoutUnit position) const WARN_UNUSED_RETURN
541 { 543 {
542 // The offset is in the block direction (y for horizontal writing modes, x for vertical writing modes). 544 // The offset is in the block direction (y for horizontal writing modes, x for vertical writing modes).
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 if (UNLIKELY(inlineBoxWrapper() != 0)) 806 if (UNLIKELY(inlineBoxWrapper() != 0))
805 deleteLineBoxWrapper(); 807 deleteLineBoxWrapper();
806 } 808 }
807 809
808 ensureRareData().m_inlineBoxWrapper = boxWrapper; 810 ensureRareData().m_inlineBoxWrapper = boxWrapper;
809 } 811 }
810 812
811 } // namespace blink 813 } // namespace blink
812 814
813 #endif // RenderBox_h 815 #endif // RenderBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698