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

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

Issue 1690253002: Align IntrinsicSizingInfo with computeIntrinsicDimensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More rebaselines Created 4 years, 10 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 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 LayoutRect logicalLayoutOverflowRectForPropagation(const ComputedStyle&) con st; 819 LayoutRect logicalLayoutOverflowRectForPropagation(const ComputedStyle&) con st;
820 LayoutRect layoutOverflowRectForPropagation(const ComputedStyle&) const; 820 LayoutRect layoutOverflowRectForPropagation(const ComputedStyle&) const;
821 821
822 bool hasOverflowModel() const { return m_overflow; } 822 bool hasOverflowModel() const { return m_overflow; }
823 bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().conta ins(m_overflow->visualOverflowRect()); } 823 bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().conta ins(m_overflow->visualOverflowRect()); }
824 824
825 virtual bool needsPreferredWidthsRecalculation() const; 825 virtual bool needsPreferredWidthsRecalculation() const;
826 826
827 struct IntrinsicSizingInfo { 827 struct IntrinsicSizingInfo {
828 STACK_ALLOCATED(); 828 STACK_ALLOCATED();
829 IntrinsicSizingInfo() : aspectRatio(0), hasWidth(true), hasHeight(true) {} 829 IntrinsicSizingInfo() : hasWidth(true), hasHeight(true) {}
830 830
831 FloatSize size; 831 FloatSize size;
832 double aspectRatio; 832 FloatSize aspectRatio;
833 bool hasWidth; 833 bool hasWidth;
834 bool hasHeight; 834 bool hasHeight;
835 835
836 void transpose(); 836 void transpose();
837 }; 837 };
838 838
839 // Computes the logical intrinsic sizing information. 839 // Computes the logical intrinsic sizing information.
840 virtual void computeIntrinsicSizingInfo(IntrinsicSizingInfo&) const { } 840 virtual void computeIntrinsicSizingInfo(IntrinsicSizingInfo&) const { }
841 841
842 IntSize scrolledContentOffset() const; 842 IntSize scrolledContentOffset() const;
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 if (UNLIKELY(m_inlineBoxWrapper != nullptr)) 1131 if (UNLIKELY(m_inlineBoxWrapper != nullptr))
1132 deleteLineBoxWrapper(); 1132 deleteLineBoxWrapper();
1133 } 1133 }
1134 1134
1135 m_inlineBoxWrapper = boxWrapper; 1135 m_inlineBoxWrapper = boxWrapper;
1136 } 1136 }
1137 1137
1138 } // namespace blink 1138 } // namespace blink
1139 1139
1140 #endif // LayoutBox_h 1140 #endif // LayoutBox_h
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698