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

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

Issue 1630793002: Stop hit testing culled inlines when a match is found (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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, 2007, 2008, 2009 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. 5 * Copyright (C) 2009 Google, Inc.
6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 // FIXME: This should be an intersection when rect-based hit tests are suppo rted by nodeAtFloatPoint. 376 // FIXME: This should be an intersection when rect-based hit tests are suppo rted by nodeAtFloatPoint.
377 if (contentBoxRect().contains(pointInBorderBox) || (!shouldApplyViewportClip () && visualOverflowRect().contains(pointInBorderBox))) { 377 if (contentBoxRect().contains(pointInBorderBox) || (!shouldApplyViewportClip () && visualOverflowRect().contains(pointInBorderBox))) {
378 const AffineTransform& localToParentTransform = this->localToParentTrans form(); 378 const AffineTransform& localToParentTransform = this->localToParentTrans form();
379 if (localToParentTransform.isInvertible()) { 379 if (localToParentTransform.isInvertible()) {
380 FloatPoint localPoint = localToParentTransform.inverse().mapPoint(Fl oatPoint(pointInParent)); 380 FloatPoint localPoint = localToParentTransform.inverse().mapPoint(Fl oatPoint(pointInParent));
381 381
382 for (LayoutObject* child = lastChild(); child; child = child->previo usSibling()) { 382 for (LayoutObject* child = lastChild(); child; child = child->previo usSibling()) {
383 // FIXME: nodeAtFloatPoint() doesn't handle rect-based hit tests yet. 383 // FIXME: nodeAtFloatPoint() doesn't handle rect-based hit tests yet.
384 if (child->nodeAtFloatPoint(result, localPoint, hitTestAction)) { 384 if (child->nodeAtFloatPoint(result, localPoint, hitTestAction)) {
385 updateHitTestResult(result, pointInBorderBox); 385 updateHitTestResult(result, pointInBorderBox);
386 if (!result.addNodeToListBasedTestResult(child->node(), loca tionInContainer)) 386 if (result.addNodeToListBasedTestResult(child->node(), locat ionInContainer) == StopHitTesting)
387 return true; 387 return true;
388 } 388 }
389 } 389 }
390 } 390 }
391 } 391 }
392 392
393 // If we didn't early exit above, we've just hit the container <svg> element . Unlike SVG 1.1, 2nd Edition allows container elements to be hit. 393 // If we didn't early exit above, we've just hit the container <svg> element . Unlike SVG 1.1, 2nd Edition allows container elements to be hit.
394 if ((hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChil dBlockBackground) && visibleToHitTestRequest(result.hitTestRequest())) { 394 if ((hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChil dBlockBackground) && visibleToHitTestRequest(result.hitTestRequest())) {
395 // Only return true here, if the last hit testing phase 'BlockBackground ' (or 'ChildBlockBackground' - depending on context) is executed. 395 // Only return true here, if the last hit testing phase 'BlockBackground ' (or 'ChildBlockBackground' - depending on context) is executed.
396 // If we'd return true in the 'Foreground' phase, hit testing would stop immediately. For SVG only trees this doesn't matter. 396 // If we'd return true in the 'Foreground' phase, hit testing would stop immediately. For SVG only trees this doesn't matter.
397 // Though when we have a <foreignObject> subtree we need to be able to d etect hits on the background of a <div> element. 397 // Though when we have a <foreignObject> subtree we need to be able to d etect hits on the background of a <div> element.
398 // If we'd return true here in the 'Foreground' phase, we are not able t o detect these hits anymore. 398 // If we'd return true here in the 'Foreground' phase, we are not able t o detect these hits anymore.
399 LayoutRect boundsRect(accumulatedOffset + location(), size()); 399 LayoutRect boundsRect(accumulatedOffset + location(), size());
400 if (locationInContainer.intersects(boundsRect)) { 400 if (locationInContainer.intersects(boundsRect)) {
401 updateHitTestResult(result, pointInBorderBox); 401 updateHitTestResult(result, pointInBorderBox);
402 if (!result.addNodeToListBasedTestResult(node(), locationInContainer , boundsRect)) 402 if (result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect) == StopHitTesting)
403 return true; 403 return true;
404 } 404 }
405 } 405 }
406 406
407 return false; 407 return false;
408 } 408 }
409 409
410 } 410 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698