OLD | NEW |
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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 { | 418 { |
419 m_repaintBoundingBox = strokeBoundingBox(); | 419 m_repaintBoundingBox = strokeBoundingBox(); |
420 if (strokeWidth() < 1.0f) | 420 if (strokeWidth() < 1.0f) |
421 m_repaintBoundingBox.inflate(1); | 421 m_repaintBoundingBox.inflate(1); |
422 SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingB
ox); | 422 SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingB
ox); |
423 } | 423 } |
424 | 424 |
425 float RenderSVGShape::strokeWidth() const | 425 float RenderSVGShape::strokeWidth() const |
426 { | 426 { |
427 SVGLengthContext lengthContext(element()); | 427 SVGLengthContext lengthContext(element()); |
428 return style()->svgStyle()->strokeWidth().value(lengthContext); | 428 return style()->svgStyle()->strokeWidth()->value(lengthContext); |
429 } | 429 } |
430 | 430 |
431 bool RenderSVGShape::hasSmoothStroke() const | 431 bool RenderSVGShape::hasSmoothStroke() const |
432 { | 432 { |
433 const SVGRenderStyle* svgStyle = style()->svgStyle(); | 433 const SVGRenderStyle* svgStyle = style()->svgStyle(); |
434 return svgStyle->strokeDashArray().isEmpty() | 434 return svgStyle->strokeDashArray()->isEmpty() |
435 && svgStyle->strokeMiterLimit() == svgStyle->initialStrokeMiterLimit() | 435 && svgStyle->strokeMiterLimit() == svgStyle->initialStrokeMiterLimit() |
436 && svgStyle->joinStyle() == svgStyle->initialJoinStyle() | 436 && svgStyle->joinStyle() == svgStyle->initialJoinStyle() |
437 && svgStyle->capStyle() == svgStyle->initialCapStyle(); | 437 && svgStyle->capStyle() == svgStyle->initialCapStyle(); |
438 } | 438 } |
439 | 439 |
440 void RenderSVGShape::drawMarkers(PaintInfo& paintInfo) | 440 void RenderSVGShape::drawMarkers(PaintInfo& paintInfo) |
441 { | 441 { |
442 ASSERT(!m_markerPositions.isEmpty()); | 442 ASSERT(!m_markerPositions.isEmpty()); |
443 | 443 |
444 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(
this); | 444 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(
this); |
(...skipping 22 matching lines...) Expand all Loading... |
467 return; | 467 return; |
468 | 468 |
469 ASSERT(m_path); | 469 ASSERT(m_path); |
470 | 470 |
471 SVGMarkerData markerData(m_markerPositions); | 471 SVGMarkerData markerData(m_markerPositions); |
472 m_path->apply(&markerData, SVGMarkerData::updateFromPathElement); | 472 m_path->apply(&markerData, SVGMarkerData::updateFromPathElement); |
473 markerData.pathIsDone(); | 473 markerData.pathIsDone(); |
474 } | 474 } |
475 | 475 |
476 } | 476 } |
OLD | NEW |