Source/core/paint/MultiColumnSetPainter.cpp - Issue 889563002: Make RenderObject::style() return a const object

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Blind fix for Mac. 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 | Annotate | Revision Log

« Source/core/css/resolver/StyleResolver.cpp ('K') | « Source/core/paint/LayerPainter.cpp ('k') | Source/core/paint/ObjectPainter.h » ('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/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/RenderDrawingRecorder.h"	10 #include "core/paint/RenderDrawingRecorder.h"

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

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_renderMultiColumnSet.flowThread()->isRenderPagedFlowThread())	37 if (m_renderMultiColumnSet.flowThread()->isRenderPagedFlowThread())

38 return;	38 return;

39	39

40 RenderStyle* blockStyle = m_renderMultiColumnSet.multiColumnBlockFlow()->sty le();	40 const RenderStyle* blockStyle = m_renderMultiColumnSet.multiColumnBlockFlow( )->style();

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

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_renderMultiColumnSet.columnGap();	45 LayoutUnit colGap = m_renderMultiColumnSet.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_renderMultiColumnSet.actualColumnCount();	50 unsigned colCount = m_renderMultiColumnSet.actualColumnCount();

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

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

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

86 }	86 }

87	87

88 ruleLogicalLeft = currLogicalLeftOffset;	88 ruleLogicalLeft = currLogicalLeftOffset;

89 }	89 }

90 }	90 }

91	91

92 } // namespace blink	92 } // namespace blink

OLD	NEW