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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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
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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 StopHitTesting) 271 StopHitTesting)
272 return true; 272 return true;
273 } 273 }
274 274
275 return false; 275 return false;
276 } 276 }
277 277
278 bool LayoutSVGShape::nodeAtFloatPointInternal(const HitTestRequest& request, 278 bool LayoutSVGShape::nodeAtFloatPointInternal(const HitTestRequest& request,
279 const FloatPoint& localPoint, 279 const FloatPoint& localPoint,
280 PointerEventsHitRules hitRules) { 280 PointerEventsHitRules hitRules) {
281 bool isVisible = (style()->visibility() == EVisibility::Visible); 281 bool isVisible = (style()->visibility() == EVisibility::kVisible);
282 if (isVisible || !hitRules.requireVisible) { 282 if (isVisible || !hitRules.requireVisible) {
283 const SVGComputedStyle& svgStyle = style()->svgStyle(); 283 const SVGComputedStyle& svgStyle = style()->svgStyle();
284 WindRule fillRule = svgStyle.fillRule(); 284 WindRule fillRule = svgStyle.fillRule();
285 if (request.svgClipContent()) 285 if (request.svgClipContent())
286 fillRule = svgStyle.clipRule(); 286 fillRule = svgStyle.clipRule();
287 if ((hitRules.canHitBoundingBox && 287 if ((hitRules.canHitBoundingBox &&
288 objectBoundingBox().contains(localPoint)) || 288 objectBoundingBox().contains(localPoint)) ||
289 (hitRules.canHitStroke && 289 (hitRules.canHitStroke &&
290 (svgStyle.hasStroke() || !hitRules.requireStroke) && 290 (svgStyle.hasStroke() || !hitRules.requireStroke) &&
291 strokeContains(localPoint, hitRules.requireStroke)) || 291 strokeContains(localPoint, hitRules.requireStroke)) ||
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 return lengthContext.valueForLength(style()->svgStyle().strokeWidth()); 330 return lengthContext.valueForLength(style()->svgStyle().strokeWidth());
331 } 331 }
332 332
333 LayoutSVGShapeRareData& LayoutSVGShape::ensureRareData() const { 333 LayoutSVGShapeRareData& LayoutSVGShape::ensureRareData() const {
334 if (!m_rareData) 334 if (!m_rareData)
335 m_rareData = WTF::makeUnique<LayoutSVGShapeRareData>(); 335 m_rareData = WTF::makeUnique<LayoutSVGShapeRareData>();
336 return *m_rareData.get(); 336 return *m_rareData.get();
337 } 337 }
338 338
339 } // namespace blink 339 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698