third_party/WebKit/Source/core/paint/MultiColumnSetPainter.cpp - Issue 1710003002: Unprefix multicol properties.

Side by Side Diff: third_party/WebKit/Source/core/paint/MultiColumnSetPainter.cpp

Issue 1710003002: Unprefix multicol properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase master 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

« third_party/WebKit/LayoutTests/fast/css/style-enumerate-properties.html ('K') | « third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThreadTest.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "core/paint/MultiColumnSetPainter.h"	5 #include "core/paint/MultiColumnSetPainter.h"

6	6

7 #include "core/layout/LayoutMultiColumnSet.h"	7 #include "core/layout/LayoutMultiColumnSet.h"

8 #include "core/paint/BlockPainter.h"	8 #include "core/paint/BlockPainter.h"

9 #include "core/paint/BoxPainter.h"	9 #include "core/paint/BoxPainter.h"

10 #include "core/paint/LayoutObjectDrawingRecorder.h"	10 #include "core/paint/LayoutObjectDrawingRecorder.h"

(...skipping 19 matching lines...) Expand all Loading...
30	30

31 paintColumnRules(paintInfo, paintOffset);	31 paintColumnRules(paintInfo, paintOffset);

32 }	32 }

33	33

34 void MultiColumnSetPainter::paintColumnRules(const PaintInfo& paintInfo, const L ayoutPoint& paintOffset)	34 void MultiColumnSetPainter::paintColumnRules(const PaintInfo& paintInfo, const L ayoutPoint& paintOffset)

35 {	35 {

36 if (m_layoutMultiColumnSet.flowThread()->isLayoutPagedFlowThread())	36 if (m_layoutMultiColumnSet.flowThread()->isLayoutPagedFlowThread())

37 return;	37 return;

38	38

39 const ComputedStyle& blockStyle = m_layoutMultiColumnSet.multiColumnBlockFlo w()->styleRef();	39 const ComputedStyle& blockStyle = m_layoutMultiColumnSet.multiColumnBlockFlo w()->styleRef();

40 const Color& ruleColor = m_layoutMultiColumnSet.resolveColor(blockStyle, CSS PropertyWebkitColumnRuleColor);	40 const Color& ruleColor = m_layoutMultiColumnSet.resolveColor(blockStyle, CSS PropertyColumnRuleColor);

41 bool ruleTransparent = blockStyle.columnRuleIsTransparent();	41 bool ruleTransparent = blockStyle.columnRuleIsTransparent();

42 EBorderStyle ruleStyle = blockStyle.columnRuleStyle();	42 EBorderStyle ruleStyle = blockStyle.columnRuleStyle();

43 LayoutUnit ruleThickness(blockStyle.columnRuleWidth());	43 LayoutUnit ruleThickness(blockStyle.columnRuleWidth());

44 LayoutUnit colGap = m_layoutMultiColumnSet.columnGap();	44 LayoutUnit colGap = m_layoutMultiColumnSet.columnGap();

45 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent;	45 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent;

46 if (!renderRule)	46 if (!renderRule)

47 return;	47 return;

48	48

49 unsigned colCount = m_layoutMultiColumnSet.actualColumnCount();	49 unsigned colCount = m_layoutMultiColumnSet.actualColumnCount();

50 if (colCount <= 1)	50 if (colCount <= 1)

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 LayoutUnit ruleBottom = m_layoutMultiColumnSet.isHorizontalWritingMo de() ? ruleTop + m_layoutMultiColumnSet.contentHeight() : ruleTop + ruleThicknes s;	84 LayoutUnit ruleBottom = m_layoutMultiColumnSet.isHorizontalWritingMo de() ? ruleTop + m_layoutMultiColumnSet.contentHeight() : ruleTop + ruleThicknes s;

85 IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft , ruleTop, ruleRight, ruleBottom);	85 IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft , ruleTop, ruleRight, ruleBottom);

86 ObjectPainter::drawLineForBoxSide(paintInfo.context, pixelSnappedRul eRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRu leRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, true);	86 ObjectPainter::drawLineForBoxSide(paintInfo.context, pixelSnappedRul eRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRu leRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, true);

87 }	87 }

88	88

89 ruleLogicalLeft = currLogicalLeftOffset;	89 ruleLogicalLeft = currLogicalLeftOffset;

90 }	90 }

91 }	91 }

92	92

93 } // namespace blink	93 } // namespace blink

OLD	NEW