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

Unified Diff: third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp

Issue 1541083002: Fix invalid selection produced when dragging mouse outside the SVG text element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp b/third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp
index 32073042bd914cd8999f8fd2c593feade0f70a23..ebfd0b975b80c8dc2908ee6b2d7c7620df0ca12a 100644
--- a/third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp
@@ -44,6 +44,17 @@
namespace blink {
+struct SearchCandidate {
+ SearchCandidate() {}
+ SearchCandidate(LayoutObject* layoutObject, float dist)
+ : candidateLayoutObject(layoutObject)
+ , distance(dist)
+ {
+ }
+ LayoutObject* candidateLayoutObject;
+ float distance;
+};
+
static inline LayoutRect adjustedEnclosingIntRect(const FloatRect& rect,
const AffineTransform& rootTransform, float strokeWidthForHairlinePadding)
{
@@ -476,4 +487,61 @@ float SVGLayoutSupport::calculateScreenFontSizeScalingFactor(const LayoutObject*
return narrowPrecisionToFloat(sqrt((pow(ctm.xScale(), 2) + pow(ctm.yScale(), 2)) / 2));
}
+static inline bool compareCandidateDistance(const SearchCandidate& r1, const SearchCandidate& r2)
+{
+ return r1.distance < r2.distance;
+}
+
+static inline float distanceToChildLayoutObject(LayoutObject* child, const FloatPoint& point)
+{
+ const AffineTransform& localToParentTransform = child->localToParentTransform();
+ if (!localToParentTransform.isInvertible())
+ return std::numeric_limits<float>::max();
+ FloatPoint childLocalPoint = localToParentTransform.inverse().mapPoint(point);
+ return child->objectBoundingBox().squaredDistanceTo(childLocalPoint);
+}
+
+LayoutObject* SVGLayoutSupport::findClosestLayoutSVGText(LayoutObject* layoutObject, const FloatPoint& point)
+{
+ // Try to find the closest LayoutSVGText. If not find the closest LayoutSVGText, try to search on candidates.
+ LayoutObject* closestLayoutObject = nullptr;
+ float closestDistance = std::numeric_limits<float>::max();
+ Vector<SearchCandidate> candidates;
+ for (LayoutObject* child = layoutObject->slowLastChild(); child; child = child->previousSibling()) {
+ if (child->isSVGText()) {
+ float distance = distanceToChildLayoutObject(child, point);
+ if (distance >= closestDistance)
+ continue;
+ candidates.clear();
+ closestLayoutObject = child;
+ closestDistance = distance;
+ continue;
+ }
+
+ if (child->isSVGContainer() && !layoutObject->isSVGHiddenContainer()) {
+ float distance = distanceToChildLayoutObject(child, point);
+ if (distance > closestDistance)
+ continue;
+ candidates.append(SearchCandidate(child, distance));
+ }
+ }
+
+ if (closestLayoutObject && candidates.isEmpty())
fs 2016/01/26 14:24:01 Now closestLayoutObject need to be considered some
hyunjunekim2 2016/01/26 14:43:17 Do you means somehow which check overlap? Could
hyunjunekim2 2016/01/26 14:53:17 I guess that if ((!closestLayoutObject || closest
+ return closestLayoutObject;
+
+ // Sort using the distance between the mouse point and a candidate.
+ // Because if the distance is close, It is high priority to search LayoutSVGText.
+ std::stable_sort(candidates.begin(), candidates.end(), compareCandidateDistance);
+
+ // Try to find the closest LayoutSVGText on candidates.
+ for (SearchCandidate& searchCandidate : candidates) {
+ LayoutObject* candidateLayoutObject = searchCandidate.candidateLayoutObject;
+ FloatPoint candidateLocalPoint = candidateLayoutObject->localToParentTransform().inverse().mapPoint(point);
+ if (LayoutObject* result = findClosestLayoutSVGText(candidateLayoutObject, candidateLocalPoint))
+ return result;
+ }
+
+ return nullptr;
+}
+
}

Powered by Google App Engine
This is Rietveld 408576698