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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGText.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) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
6 * Copyright (C) 2008 Rob Buis <buis@kde.org> 6 * Copyright (C) 2008 Rob Buis <buis@kde.org>
7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
9 * Copyright (C) 2012 Google Inc. 9 * Copyright (C) 2012 Google Inc.
10 * 10 *
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 bool LayoutSVGText::nodeAtFloatPoint(HitTestResult& result, 281 bool LayoutSVGText::nodeAtFloatPoint(HitTestResult& result,
282 const FloatPoint& pointInParent, 282 const FloatPoint& pointInParent,
283 HitTestAction hitTestAction) { 283 HitTestAction hitTestAction) {
284 // We only draw in the foreground phase, so we only hit-test then. 284 // We only draw in the foreground phase, so we only hit-test then.
285 if (hitTestAction != HitTestForeground) 285 if (hitTestAction != HitTestForeground)
286 return false; 286 return false;
287 287
288 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, 288 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING,
289 result.hitTestRequest(), 289 result.hitTestRequest(),
290 style()->pointerEvents()); 290 style()->pointerEvents());
291 bool isVisible = (style()->visibility() == EVisibility::Visible); 291 bool isVisible = (style()->visibility() == EVisibility::kVisible);
292 if (isVisible || !hitRules.requireVisible) { 292 if (isVisible || !hitRules.requireVisible) {
293 if ((hitRules.canHitBoundingBox && !objectBoundingBox().isEmpty()) || 293 if ((hitRules.canHitBoundingBox && !objectBoundingBox().isEmpty()) ||
294 (hitRules.canHitStroke && 294 (hitRules.canHitStroke &&
295 (style()->svgStyle().hasStroke() || !hitRules.requireStroke)) || 295 (style()->svgStyle().hasStroke() || !hitRules.requireStroke)) ||
296 (hitRules.canHitFill && 296 (hitRules.canHitFill &&
297 (style()->svgStyle().hasFill() || !hitRules.requireFill))) { 297 (style()->svgStyle().hasFill() || !hitRules.requireFill))) {
298 FloatPoint localPoint; 298 FloatPoint localPoint;
299 if (!SVGLayoutSupport::transformToUserSpaceAndCheckClipping( 299 if (!SVGLayoutSupport::transformToUserSpaceAndCheckClipping(
300 *this, localToSVGParentTransform(), pointInParent, localPoint)) 300 *this, localToSVGParentTransform(), pointInParent, localPoint))
301 return false; 301 return false;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 411
412 void LayoutSVGText::invalidateTreeIfNeeded( 412 void LayoutSVGText::invalidateTreeIfNeeded(
413 const PaintInvalidationState& paintInvalidationState) { 413 const PaintInvalidationState& paintInvalidationState) {
414 // TODO(wangxianzhu): Verify if the inherited 414 // TODO(wangxianzhu): Verify if the inherited
415 // LayoutBoxModelObject::invalidateTreeIfNeeded() 415 // LayoutBoxModelObject::invalidateTreeIfNeeded()
416 // is applicable here. If yes, remove this overriding method. 416 // is applicable here. If yes, remove this overriding method.
417 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState); 417 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState);
418 } 418 }
419 419
420 } // namespace blink 420 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698