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

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

Issue 1321613002: Refactor ObjectPainter::paintOutline to take a paintOffset (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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 // 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/SVGShapePainter.h" 6 #include "core/paint/SVGShapePainter.h"
7 7
8 #include "core/layout/svg/LayoutSVGPath.h" 8 #include "core/layout/svg/LayoutSVGPath.h"
9 #include "core/layout/svg/LayoutSVGResourceMarker.h" 9 #include "core/layout/svg/LayoutSVGResourceMarker.h"
10 #include "core/layout/svg/LayoutSVGShape.h" 10 #include "core/layout/svg/LayoutSVGShape.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 ASSERT_NOT_REACHED(); 109 ASSERT_NOT_REACHED();
110 break; 110 break;
111 } 111 }
112 } 112 }
113 } 113 }
114 } 114 }
115 115
116 if (m_layoutSVGShape.style()->outlineWidth()) { 116 if (m_layoutSVGShape.style()->outlineWidth()) {
117 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering); 117 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);
118 outlinePaintInfo.phase = PaintPhaseSelfOutline; 118 outlinePaintInfo.phase = PaintPhaseSelfOutline;
119 LayoutRect layoutObjectBounds(boundingBox); 119 LayoutRect layoutBoundingBox(boundingBox);
120 LayoutRect visualOverflowRect = ObjectPainter::outlineBounds(layoutObjec tBounds, m_layoutSVGShape.styleRef()); 120 LayoutRect visualOverflowRect = ObjectPainter::outlineRectForSVG(layoutB oundingBox.size(), m_layoutSVGShape.styleRef());
121 ObjectPainter(m_layoutSVGShape).paintOutline(outlinePaintInfo, layoutObj ectBounds, visualOverflowRect); 121 ObjectPainter(m_layoutSVGShape).paintOutline(outlinePaintInfo, visualOve rflowRect, layoutBoundingBox.size(), layoutBoundingBox.location());
122 } 122 }
123 } 123 }
124 124
125 class PathWithTemporaryWindingRule { 125 class PathWithTemporaryWindingRule {
126 public: 126 public:
127 PathWithTemporaryWindingRule(Path& path, SkPath::FillType fillType) 127 PathWithTemporaryWindingRule(Path& path, SkPath::FillType fillType)
128 : m_path(const_cast<SkPath&>(path.skPath())) 128 : m_path(const_cast<SkPath&>(path.skPath()))
129 { 129 {
130 m_savedFillType = m_path.getFillType(); 130 m_savedFillType = m_path.getFillType();
131 m_path.setFillType(fillType); 131 m_path.setFillType(fillType);
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 position = nonScalingTransform.mapPoint(position); 256 position = nonScalingTransform.mapPoint(position);
257 FloatRect subpathRect = LayoutSVGPath::zeroLengthSubpathRect(position, m _layoutSVGShape.strokeWidth()); 257 FloatRect subpathRect = LayoutSVGPath::zeroLengthSubpathRect(position, m _layoutSVGShape.strokeWidth());
258 if (m_layoutSVGShape.style()->svgStyle().capStyle() == SquareCap) 258 if (m_layoutSVGShape.style()->svgStyle().capStyle() == SquareCap)
259 context->drawRect(subpathRect, fillPaint); 259 context->drawRect(subpathRect, fillPaint);
260 else 260 else
261 context->drawOval(subpathRect, fillPaint); 261 context->drawOval(subpathRect, fillPaint);
262 } 262 }
263 } 263 }
264 264
265 } // namespace blink 265 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698