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

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

Issue 1224933002: Combine outline and focus ring code paths (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix empty focus ring on Mac 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/paint/SVGInlineFlowBoxPainter.cpp ('k') | Source/core/paint/TablePainter.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 // 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 layoutBoundingBox(boundingBox); 119 ObjectPainter(m_layoutSVGShape).paintOutline(outlinePaintInfo, LayoutPoi nt(boundingBox.location()));
120 ObjectPainter(m_layoutSVGShape).paintOutline(outlinePaintInfo, m_layoutS VGShape.outlineVisualOverflowRect(), layoutBoundingBox.size(), layoutBoundingBox .location());
121 } 120 }
122 } 121 }
123 122
124 class PathWithTemporaryWindingRule { 123 class PathWithTemporaryWindingRule {
125 public: 124 public:
126 PathWithTemporaryWindingRule(Path& path, SkPath::FillType fillType) 125 PathWithTemporaryWindingRule(Path& path, SkPath::FillType fillType)
127 : m_path(const_cast<SkPath&>(path.skPath())) 126 : m_path(const_cast<SkPath&>(path.skPath()))
128 { 127 {
129 m_savedFillType = m_path.getFillType(); 128 m_savedFillType = m_path.getFillType();
130 m_path.setFillType(fillType); 129 m_path.setFillType(fillType);
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 position = nonScalingTransform.mapPoint(position); 254 position = nonScalingTransform.mapPoint(position);
256 FloatRect subpathRect = LayoutSVGPath::zeroLengthSubpathRect(position, m _layoutSVGShape.strokeWidth()); 255 FloatRect subpathRect = LayoutSVGPath::zeroLengthSubpathRect(position, m _layoutSVGShape.strokeWidth());
257 if (m_layoutSVGShape.style()->svgStyle().capStyle() == SquareCap) 256 if (m_layoutSVGShape.style()->svgStyle().capStyle() == SquareCap)
258 context->drawRect(subpathRect, fillPaint); 257 context->drawRect(subpathRect, fillPaint);
259 else 258 else
260 context->drawOval(subpathRect, fillPaint); 259 context->drawOval(subpathRect, fillPaint);
261 } 260 }
262 } 261 }
263 262
264 } // namespace blink 263 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/SVGInlineFlowBoxPainter.cpp ('k') | Source/core/paint/TablePainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698