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

Side by Side Diff: Source/core/rendering/svg/RenderSVGShape.cpp

Issue 203193008: Make supportsMarkers non virtual (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 6 years, 9 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
« no previous file with comments | « no previous file | Source/core/rendering/svg/SVGResources.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) 2005, 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2005, 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. 5 * Copyright (C) 2009 Google, Inc.
6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 8 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
9 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org> 9 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
10 * Copyright (C) 2011 University of Szeged 10 * Copyright (C) 2011 University of Szeged
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 AffineTransform RenderSVGShape::nonScalingStrokeTransform() const 189 AffineTransform RenderSVGShape::nonScalingStrokeTransform() const
190 { 190 {
191 return toSVGGraphicsElement(element())->getScreenCTM(SVGGraphicsElement::Dis allowStyleUpdate); 191 return toSVGGraphicsElement(element())->getScreenCTM(SVGGraphicsElement::Dis allowStyleUpdate);
192 } 192 }
193 193
194 bool RenderSVGShape::shouldGenerateMarkerPositions() const 194 bool RenderSVGShape::shouldGenerateMarkerPositions() const
195 { 195 {
196 if (!style()->svgStyle()->hasMarkers()) 196 if (!style()->svgStyle()->hasMarkers())
197 return false; 197 return false;
198 198
199 if (!toSVGGraphicsElement(element())->supportsMarkers()) 199 if (!SVGResources::supportsMarkers(*toSVGGraphicsElement(element())))
200 return false; 200 return false;
201 201
202 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject( this); 202 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject( this);
203 if (!resources) 203 if (!resources)
204 return false; 204 return false;
205 205
206 return resources->markerStart() || resources->markerMid() || resources->mark erEnd(); 206 return resources->markerStart() || resources->markerMid() || resources->mark erEnd();
207 } 207 }
208 208
209 void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context) 209 void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context)
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 return; 460 return;
461 461
462 ASSERT(m_path); 462 ASSERT(m_path);
463 463
464 SVGMarkerData markerData(m_markerPositions); 464 SVGMarkerData markerData(m_markerPositions);
465 m_path->apply(&markerData, SVGMarkerData::updateFromPathElement); 465 m_path->apply(&markerData, SVGMarkerData::updateFromPathElement);
466 markerData.pathIsDone(); 466 markerData.pathIsDone();
467 } 467 }
468 468
469 } 469 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/svg/SVGResources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698