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

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

Issue 12641003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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 | « Source/WebCore/rendering/svg/RenderSVGShape.h ('k') | no next file » | 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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 if (svgStyle->shapeRendering() == SR_CRISPEDGES) 290 if (svgStyle->shapeRendering() == SR_CRISPEDGES)
291 childPaintInfo.context->setShouldAntialias(false); 291 childPaintInfo.context->setShouldAntialias(false);
292 292
293 fillAndStrokeShape(childPaintInfo.context); 293 fillAndStrokeShape(childPaintInfo.context);
294 if (!m_markerPositions.isEmpty()) 294 if (!m_markerPositions.isEmpty())
295 drawMarkers(childPaintInfo); 295 drawMarkers(childPaintInfo);
296 } 296 }
297 } 297 }
298 298
299 if (drawsOutline) 299 if (drawsOutline)
300 paintOutline(childPaintInfo.context, IntRect(boundingBox)); 300 paintOutline(childPaintInfo, IntRect(boundingBox));
301 } 301 }
302 } 302 }
303 303
304 // This method is called from inside paintOutline() since we call paintOutline() 304 // This method is called from inside paintOutline() since we call paintOutline()
305 // while transformed to our coord system, return local coords 305 // while transformed to our coord system, return local coords
306 void RenderSVGShape::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint &) 306 void RenderSVGShape::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint &, const RenderLayerModelObject*)
307 { 307 {
308 IntRect rect = enclosingIntRect(repaintRectInLocalCoordinates()); 308 IntRect rect = enclosingIntRect(repaintRectInLocalCoordinates());
309 if (!rect.isEmpty()) 309 if (!rect.isEmpty())
310 rects.append(rect); 310 rects.append(rect);
311 } 311 }
312 312
313 bool RenderSVGShape::nodeAtFloatPoint(const HitTestRequest& request, HitTestResu lt& result, const FloatPoint& pointInParent, HitTestAction hitTestAction) 313 bool RenderSVGShape::nodeAtFloatPoint(const HitTestRequest& request, HitTestResu lt& result, const FloatPoint& pointInParent, HitTestAction hitTestAction)
314 { 314 {
315 // We only draw in the forground phase, so we only hit-test then. 315 // We only draw in the forground phase, so we only hit-test then.
316 if (hitTestAction != HitTestForeground) 316 if (hitTestAction != HitTestForeground)
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 ASSERT(m_path); 461 ASSERT(m_path);
462 462
463 SVGMarkerData markerData(m_markerPositions); 463 SVGMarkerData markerData(m_markerPositions);
464 m_path->apply(&markerData, SVGMarkerData::updateFromPathElement); 464 m_path->apply(&markerData, SVGMarkerData::updateFromPathElement);
465 markerData.pathIsDone(); 465 markerData.pathIsDone();
466 } 466 }
467 467
468 } 468 }
469 469
470 #endif // ENABLE(SVG) 470 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGShape.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698