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

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

Issue 870013003: Div having contentEditable and display:grid cannot be edited if it is empty. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: ResolveConflict Created 5 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
« no previous file with comments | « Source/core/dom/Position.cpp ('k') | Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 LayoutUnit logicalWidth() const { return style()->isHorizontalWritingMode() ? m_frameRect.width() : m_frameRect.height(); } 101 LayoutUnit logicalWidth() const { return style()->isHorizontalWritingMode() ? m_frameRect.width() : m_frameRect.height(); }
102 LayoutUnit logicalHeight() const { return style()->isHorizontalWritingMode() ? m_frameRect.height() : m_frameRect.width(); } 102 LayoutUnit logicalHeight() const { return style()->isHorizontalWritingMode() ? m_frameRect.height() : m_frameRect.width(); }
103 103
104 LayoutUnit constrainLogicalWidthByMinMax(LayoutUnit, LayoutUnit, LayoutBlock *) const; 104 LayoutUnit constrainLogicalWidthByMinMax(LayoutUnit, LayoutUnit, LayoutBlock *) const;
105 LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUn it intrinsicContentHeight) const; 105 LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUn it intrinsicContentHeight) const;
106 LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight , LayoutUnit intrinsicContentHeight) const; 106 LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight , LayoutUnit intrinsicContentHeight) const;
107 107
108 int pixelSnappedLogicalHeight() const { return style()->isHorizontalWritingM ode() ? pixelSnappedHeight() : pixelSnappedWidth(); } 108 int pixelSnappedLogicalHeight() const { return style()->isHorizontalWritingM ode() ? pixelSnappedHeight() : pixelSnappedWidth(); }
109 int pixelSnappedLogicalWidth() const { return style()->isHorizontalWritingMo de() ? pixelSnappedWidth() : pixelSnappedHeight(); } 109 int pixelSnappedLogicalWidth() const { return style()->isHorizontalWritingMo de() ? pixelSnappedWidth() : pixelSnappedHeight(); }
110 110
111 LayoutUnit minimumLogicalHeightForEmptyLine() const
112 {
113 return borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()
114 + lineHeight(true, isHorizontalWritingMode() ? HorizontalLine : Vert icalLine, PositionOfInteriorLineBoxes);
115 }
116
111 void setLogicalLeft(LayoutUnit left) 117 void setLogicalLeft(LayoutUnit left)
112 { 118 {
113 if (style()->isHorizontalWritingMode()) 119 if (style()->isHorizontalWritingMode())
114 setX(left); 120 setX(left);
115 else 121 else
116 setY(left); 122 setY(left);
117 } 123 }
118 void setLogicalTop(LayoutUnit top) 124 void setLogicalTop(LayoutUnit top)
119 { 125 {
120 if (style()->isHorizontalWritingMode()) 126 if (style()->isHorizontalWritingMode())
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 if (UNLIKELY(inlineBoxWrapper() != 0)) 851 if (UNLIKELY(inlineBoxWrapper() != 0))
846 deleteLineBoxWrapper(); 852 deleteLineBoxWrapper();
847 } 853 }
848 854
849 ensureRareData().m_inlineBoxWrapper = boxWrapper; 855 ensureRareData().m_inlineBoxWrapper = boxWrapper;
850 } 856 }
851 857
852 } // namespace blink 858 } // namespace blink
853 859
854 #endif // LayoutBox_h 860 #endif // LayoutBox_h
OLDNEW
« no previous file with comments | « Source/core/dom/Position.cpp ('k') | Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698