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

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

Issue 946553003: [CSS Grid Layout] Avoid reset override logical width/height for non relative elements (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 5 years, 9 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 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 613
614 bool hasOverflowModel() const { return m_overflow; } 614 bool hasOverflowModel() const { return m_overflow; }
615 bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().conta ins(m_overflow->visualOverflowRect()); } 615 bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().conta ins(m_overflow->visualOverflowRect()); }
616 616
617 virtual bool needsPreferredWidthsRecalculation() const; 617 virtual bool needsPreferredWidthsRecalculation() const;
618 virtual void computeIntrinsicRatioInformation(FloatSize& /* intrinsicSize */ , double& /* intrinsicRatio */) const { } 618 virtual void computeIntrinsicRatioInformation(FloatSize& /* intrinsicSize */ , double& /* intrinsicRatio */) const { }
619 619
620 IntSize scrolledContentOffset() const; 620 IntSize scrolledContentOffset() const;
621 void applyCachedClipAndScrollOffsetForPaintInvalidation(LayoutRect& paintRec t) const; 621 void applyCachedClipAndScrollOffsetForPaintInvalidation(LayoutRect& paintRec t) const;
622 622
623 virtual bool hasRelativeLogicalWidth() const;
623 virtual bool hasRelativeLogicalHeight() const; 624 virtual bool hasRelativeLogicalHeight() const;
624 625
625 bool hasHorizontalLayoutOverflow() const 626 bool hasHorizontalLayoutOverflow() const
626 { 627 {
627 if (!m_overflow) 628 if (!m_overflow)
628 return false; 629 return false;
629 630
630 LayoutRect layoutOverflowRect = m_overflow->layoutOverflowRect(); 631 LayoutRect layoutOverflowRect = m_overflow->layoutOverflowRect();
631 LayoutRect noOverflowRect = this->noOverflowRect(); 632 LayoutRect noOverflowRect = this->noOverflowRect();
632 return layoutOverflowRect.x() < noOverflowRect.x() || layoutOverflowRect .maxX() > noOverflowRect.maxX(); 633 return layoutOverflowRect.x() < noOverflowRect.x() || layoutOverflowRect .maxX() > noOverflowRect.maxX();
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 if (UNLIKELY(inlineBoxWrapper() != 0)) 857 if (UNLIKELY(inlineBoxWrapper() != 0))
857 deleteLineBoxWrapper(); 858 deleteLineBoxWrapper();
858 } 859 }
859 860
860 ensureRareData().m_inlineBoxWrapper = boxWrapper; 861 ensureRareData().m_inlineBoxWrapper = boxWrapper;
861 } 862 }
862 863
863 } // namespace blink 864 } // namespace blink
864 865
865 #endif // LayoutBox_h 866 #endif // LayoutBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698