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

Side by Side Diff: Source/core/layout/svg/LayoutSVGShape.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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/layout/svg/LayoutSVGRoot.cpp ('k') | Source/core/layout/svg/LayoutSVGTSpan.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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 return true; 204 return true;
205 } 205 }
206 206
207 return false; 207 return false;
208 } 208 }
209 209
210 bool LayoutSVGShape::nodeAtFloatPointInternal(const HitTestRequest& request, con st FloatPoint& localPoint, PointerEventsHitRules hitRules) 210 bool LayoutSVGShape::nodeAtFloatPointInternal(const HitTestRequest& request, con st FloatPoint& localPoint, PointerEventsHitRules hitRules)
211 { 211 {
212 bool isVisible = (style()->visibility() == VISIBLE); 212 bool isVisible = (style()->visibility() == VISIBLE);
213 if (isVisible || !hitRules.requireVisible) { 213 if (isVisible || !hitRules.requireVisible) {
214 const SVGLayoutStyle& svgStyle = style()->svgStyle(); 214 const SVGComputedStyle& svgStyle = style()->svgStyle();
215 WindRule fillRule = svgStyle.fillRule(); 215 WindRule fillRule = svgStyle.fillRule();
216 if (request.svgClipContent()) 216 if (request.svgClipContent())
217 fillRule = svgStyle.clipRule(); 217 fillRule = svgStyle.clipRule();
218 if ((hitRules.canHitBoundingBox && objectBoundingBox().contains(localPoi nt)) 218 if ((hitRules.canHitBoundingBox && objectBoundingBox().contains(localPoi nt))
219 || (hitRules.canHitStroke && (svgStyle.hasStroke() || !hitRules.requ ireStroke) && strokeContains(localPoint, hitRules.requireStroke)) 219 || (hitRules.canHitStroke && (svgStyle.hasStroke() || !hitRules.requ ireStroke) && strokeContains(localPoint, hitRules.requireStroke))
220 || (hitRules.canHitFill && (svgStyle.hasFill() || !hitRules.requireF ill) && fillContains(localPoint, hitRules.requireFill, fillRule))) 220 || (hitRules.canHitFill && (svgStyle.hasFill() || !hitRules.requireF ill) && fillContains(localPoint, hitRules.requireFill, fillRule)))
221 return true; 221 return true;
222 } 222 }
223 return false; 223 return false;
224 } 224 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 SVGLayoutSupport::intersectPaintInvalidationRectWithResources(this, m_paintI nvalidationBoundingBox); 260 SVGLayoutSupport::intersectPaintInvalidationRectWithResources(this, m_paintI nvalidationBoundingBox);
261 } 261 }
262 262
263 float LayoutSVGShape::strokeWidth() const 263 float LayoutSVGShape::strokeWidth() const
264 { 264 {
265 SVGLengthContext lengthContext(element()); 265 SVGLengthContext lengthContext(element());
266 return lengthContext.valueForLength(style()->svgStyle().strokeWidth()); 266 return lengthContext.valueForLength(style()->svgStyle().strokeWidth());
267 } 267 }
268 268
269 } 269 }
OLDNEW
« no previous file with comments | « Source/core/layout/svg/LayoutSVGRoot.cpp ('k') | Source/core/layout/svg/LayoutSVGTSpan.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698