Source/core/paint/MultiColumnSetPainter.cpp - Issue 1150313002: *** NOT FOR LANDING *** Unprefix multicol behind a flag

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

Issue 1150313002: *** NOT FOR LANDING *** Unprefix multicol behind a flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/paint/BlockPainter.cpp ('k') | Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

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 "config.h"	5 #include "config.h"

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

7	7

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

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

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

(...skipping 20 matching lines...) Expand all Loading...
31	31

32 paintColumnRules(paintInfo, paintOffset);	32 paintColumnRules(paintInfo, paintOffset);

33 }	33 }

34	34

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

36 {	36 {

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

38 return;	38 return;

39	39

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

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

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

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

44 LayoutUnit ruleThickness = blockStyle.columnRuleWidth();	44 LayoutUnit ruleThickness = blockStyle.columnRuleWidth();

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

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

47 if (!renderRule)	47 if (!renderRule)

48 return;	48 return;

49	49

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

51 if (colCount <= 1)	51 if (colCount <= 1)

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

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

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

88 }	88 }

89	89

90 ruleLogicalLeft = currLogicalLeftOffset;	90 ruleLogicalLeft = currLogicalLeftOffset;

91 }	91 }

92 }	92 }

93	93

94 } // namespace blink	94 } // namespace blink

OLD	NEW