Chromium Code Reviews| Index: third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp |
| diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp |
| index fbe5909f7a0917a37e843ac9a56c9a385ae59861..1f020a1611480db55b8681fd97a08d9b5134840d 100644 |
| --- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp |
| +++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp |
| @@ -28,6 +28,7 @@ |
| #include "core/layout/LayoutAnalyzer.h" |
| #include "core/layout/LayoutPart.h" |
| #include "core/layout/LayoutView.h" |
| +#include "core/layout/svg/LayoutSVGText.h" |
| #include "core/layout/svg/SVGLayoutSupport.h" |
| #include "core/layout/svg/SVGResourcesCache.h" |
| #include "core/paint/PaintLayer.h" |
| @@ -281,6 +282,63 @@ void LayoutSVGRoot::willBeRemovedFromTree() |
| LayoutReplaced::willBeRemovedFromTree(); |
| } |
| +PositionWithAffinity LayoutSVGRoot::positionForPoint(const LayoutPoint& point) |
| +{ |
| + LayoutObject* closestDescendant = nullptr; |
|
fs
2016/01/12 17:40:17
Since this is always LayoutSVGText it could be tha
|
| + float closestDistance = std::numeric_limits<float>::max(); |
| + FloatPoint absolutePoint(point); |
| + AffineTransform transformToParent; |
| + transformToParent.makeIdentity(); |
|
fs
2016/01/12 17:40:17
The AffineTransform constructor does this.
fs
2016/01/12 17:40:17
The AffineTransform constructor does this.
|
| + for (LayoutObject* descendant = firstChild(); descendant; descendant = descendant->nextInPreOrder(this)) { |
|
fs
2016/01/12 17:40:17
This will walk the entire SVG fragment. I think we
pdr.
2016/01/12 23:52:47
+1, LayoutBox::positionForPoint is a good starting
|
| + if (descendant->isSVGText()) { |
| + FloatRect boundaries = toLayoutSVGText(descendant)->objectBoundingBox(); |
| + FloatPoint closestPoint; |
| + AffineTransform transform; |
| + transform.makeIdentity(); |
|
fs
2016/01/12 17:40:17
Done by the constructor.
|
| + |
| + LayoutObject* layoutObject = descendant; |
| + while (layoutObject) { |
| + layoutObject = layoutObject->parent(); |
| + if (layoutObject->isSVGRoot()) |
| + break; |
| + transform = layoutObject->localToParentTransform() * transform; |
| + } |
| + transform = m_localToBorderBoxTransform * transform; |
| + |
| + boundaries = transform.mapRect(boundaries); |
|
fs
2016/01/12 17:40:17
|transform| here does not include any transform fr
|
| + closestPoint.setX(std::max(std::min(absolutePoint.x(), boundaries.maxX()), boundaries.x())); |
|
fs
2016/01/12 17:40:17
Could also use clampTo(...) here instead of max(mi
|
| + closestPoint.setY(std::max(std::min(absolutePoint.y(), boundaries.maxY()), boundaries.y())); |
| + float distance = (absolutePoint - closestPoint).diagonalLengthSquared(); |
| + |
| + if (distance < closestDistance) { |
| + closestDistance = distance; |
| + closestDescendant = descendant; |
| + transformToParent = transform; |
| + } |
| + } |
| + } |
| + |
| + if (!closestDescendant) |
| + return createPositionWithAffinity(0); |
|
fs
2016/01/12 17:40:17
There are most likely cases where we should be cal
|
| + |
| + AffineTransform transform; |
| + transform.makeIdentity(); |
| + if (toLayoutSVGText(closestDescendant)->location().x()) |
| + transform.setE(toLayoutSVGText(closestDescendant)->location().x()); |
| + if (toLayoutSVGText(closestDescendant)->location().y()) |
| + transform.setF(toLayoutSVGText(closestDescendant)->location().y()); |
| + transformToParent = transformToParent * closestDescendant->localToParentTransform() * transform; |
|
fs
2016/01/12 17:40:17
This reinforces the comment above. Also, location(
|
| + |
| + absolutePoint = transformToParent.inverse().mapPoint(absolutePoint); |
| + |
| + if (absolutePoint.x() < 0) |
|
fs
2016/01/12 17:40:17
Why?
|
| + absolutePoint.setX(0); |
| + if (absolutePoint.y() < 0) |
| + absolutePoint.setY(0); |
| + |
| + return closestDescendant->positionForPoint(LayoutPoint(absolutePoint.x(), absolutePoint.y())); |
| +} |
| + |
| // LayoutBox methods will expect coordinates w/o any transforms in coordinates |
| // relative to our borderBox origin. This method gives us exactly that. |
| void LayoutSVGRoot::buildLocalToBorderBoxTransform() |