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

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

Issue 1032823003: Refactor HitTestResult to store the HitTestRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated as per review comments 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
« no previous file with comments | « Source/core/layout/svg/LayoutSVGText.h ('k') | Source/core/layout/svg/line/SVGInlineTextBox.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) 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 clearNeedsLayout(); 409 clearNeedsLayout();
410 } 410 }
411 411
412 RootInlineBox* LayoutSVGText::createRootInlineBox() 412 RootInlineBox* LayoutSVGText::createRootInlineBox()
413 { 413 {
414 RootInlineBox* box = new SVGRootInlineBox(*this); 414 RootInlineBox* box = new SVGRootInlineBox(*this);
415 box->setHasVirtualLogicalHeight(); 415 box->setHasVirtualLogicalHeight();
416 return box; 416 return box;
417 } 417 }
418 418
419 bool LayoutSVGText::nodeAtFloatPoint(const HitTestRequest& request, HitTestResul t& result, const FloatPoint& pointInParent, HitTestAction hitTestAction) 419 bool LayoutSVGText::nodeAtFloatPoint(HitTestResult& result, const FloatPoint& po intInParent, HitTestAction hitTestAction)
420 { 420 {
421 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, r equest, style()->pointerEvents()); 421 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, r esult.hitTestRequest(), style()->pointerEvents());
422 bool isVisible = (style()->visibility() == VISIBLE); 422 bool isVisible = (style()->visibility() == VISIBLE);
423 if (isVisible || !hitRules.requireVisible) { 423 if (isVisible || !hitRules.requireVisible) {
424 if ((hitRules.canHitBoundingBox && !objectBoundingBox().isEmpty()) 424 if ((hitRules.canHitBoundingBox && !objectBoundingBox().isEmpty())
425 || (hitRules.canHitStroke && (style()->svgStyle().hasStroke() || !hi tRules.requireStroke)) 425 || (hitRules.canHitStroke && (style()->svgStyle().hasStroke() || !hi tRules.requireStroke))
426 || (hitRules.canHitFill && (style()->svgStyle().hasFill() || !hitRul es.requireFill))) { 426 || (hitRules.canHitFill && (style()->svgStyle().hasFill() || !hitRul es.requireFill))) {
427 FloatPoint localPoint; 427 FloatPoint localPoint;
428 if (!SVGLayoutSupport::transformToUserSpaceAndCheckClipping(this, lo calToParentTransform(), pointInParent, localPoint)) 428 if (!SVGLayoutSupport::transformToUserSpaceAndCheckClipping(this, lo calToParentTransform(), pointInParent, localPoint))
429 return false; 429 return false;
430 430
431 if (hitRules.canHitBoundingBox && !objectBoundingBox().contains(loca lPoint)) 431 if (hitRules.canHitBoundingBox && !objectBoundingBox().contains(loca lPoint))
432 return false; 432 return false;
433 433
434 HitTestLocation hitTestLocation(LayoutPoint(flooredIntPoint(localPoi nt))); 434 HitTestLocation hitTestLocation(LayoutPoint(flooredIntPoint(localPoi nt)));
435 return LayoutBlock::nodeAtPoint(request, result, hitTestLocation, La youtPoint(), hitTestAction); 435 return LayoutBlock::nodeAtPoint(result, hitTestLocation, LayoutPoint (), hitTestAction);
436 } 436 }
437 } 437 }
438 438
439 return false; 439 return false;
440 } 440 }
441 441
442 PositionWithAffinity LayoutSVGText::positionForPoint(const LayoutPoint& pointInC ontents) 442 PositionWithAffinity LayoutSVGText::positionForPoint(const LayoutPoint& pointInC ontents)
443 { 443 {
444 RootInlineBox* rootBox = firstRootBox(); 444 RootInlineBox* rootBox = firstRootBox();
445 if (!rootBox) 445 if (!rootBox)
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 SVGResourcesCache::clientWillBeRemovedFromTree(child); 503 SVGResourcesCache::clientWillBeRemovedFromTree(child);
504 504
505 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; 505 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
506 FontCachePurgePreventer fontCachePurgePreventer; 506 FontCachePurgePreventer fontCachePurgePreventer;
507 subtreeChildWillBeRemoved(child, affectedAttributes); 507 subtreeChildWillBeRemoved(child, affectedAttributes);
508 LayoutSVGBlock::removeChild(child); 508 LayoutSVGBlock::removeChild(child);
509 subtreeChildWasRemoved(affectedAttributes); 509 subtreeChildWasRemoved(affectedAttributes);
510 } 510 }
511 511
512 } 512 }
OLDNEW
« no previous file with comments | « Source/core/layout/svg/LayoutSVGText.h ('k') | Source/core/layout/svg/line/SVGInlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698