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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.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, 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 10 matching lines...) Expand all
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 */ 22 */
23 23
24 #include "core/layout/svg/LayoutSVGRoot.h" 24 #include "core/layout/svg/LayoutSVGRoot.h"
25 25
26 #include "core/frame/LocalFrame.h" 26 #include "core/frame/LocalFrame.h"
27 #include "core/layout/HitTestResult.h" 27 #include "core/layout/HitTestResult.h"
28 #include "core/layout/LayoutAnalyzer.h" 28 #include "core/layout/LayoutAnalyzer.h"
29 #include "core/layout/LayoutPart.h" 29 #include "core/layout/LayoutPart.h"
30 #include "core/layout/LayoutView.h" 30 #include "core/layout/LayoutView.h"
31 #include "core/layout/svg/LayoutSVGText.h"
31 #include "core/layout/svg/SVGLayoutSupport.h" 32 #include "core/layout/svg/SVGLayoutSupport.h"
32 #include "core/layout/svg/SVGResourcesCache.h" 33 #include "core/layout/svg/SVGResourcesCache.h"
33 #include "core/paint/PaintLayer.h" 34 #include "core/paint/PaintLayer.h"
34 #include "core/paint/SVGRootPainter.h" 35 #include "core/paint/SVGRootPainter.h"
35 #include "core/svg/SVGElement.h" 36 #include "core/svg/SVGElement.h"
36 #include "core/svg/SVGSVGElement.h" 37 #include "core/svg/SVGSVGElement.h"
37 #include "core/svg/graphics/SVGImage.h" 38 #include "core/svg/graphics/SVGImage.h"
38 #include "platform/LengthFunctions.h" 39 #include "platform/LengthFunctions.h"
39 40
40 namespace blink { 41 namespace blink {
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 LayoutReplaced::insertedIntoTree(); 267 LayoutReplaced::insertedIntoTree();
267 SVGResourcesCache::clientWasAddedToTree(this, styleRef()); 268 SVGResourcesCache::clientWasAddedToTree(this, styleRef());
268 } 269 }
269 270
270 void LayoutSVGRoot::willBeRemovedFromTree() 271 void LayoutSVGRoot::willBeRemovedFromTree()
271 { 272 {
272 SVGResourcesCache::clientWillBeRemovedFromTree(this); 273 SVGResourcesCache::clientWillBeRemovedFromTree(this);
273 LayoutReplaced::willBeRemovedFromTree(); 274 LayoutReplaced::willBeRemovedFromTree();
274 } 275 }
275 276
277 PositionWithAffinity LayoutSVGRoot::positionForPoint(const LayoutPoint& point)
278 {
279 FloatPoint absolutePoint = FloatPoint(point);
280 absolutePoint = m_localToBorderBoxTransform.inverse().mapPoint(absolutePoint );
281 LayoutObject* closestDescendant = SVGLayoutSupport::findClosestLayoutSVGText (this, absolutePoint);
282
283 if (!closestDescendant)
284 return LayoutReplaced::positionForPoint(point);
285
286 LayoutObject* layoutObject = closestDescendant;
287 AffineTransform transform = closestDescendant->localToParentTransform();
288 transform.translate(toLayoutSVGText(closestDescendant)->location().x(), toLa youtSVGText(closestDescendant)->location().y());
289 while (layoutObject) {
290 layoutObject = layoutObject->parent();
291 if (layoutObject->isSVGRoot())
292 break;
293 transform = layoutObject->localToParentTransform() * transform;
294 }
295
296 absolutePoint = transform.inverse().mapPoint(absolutePoint);
297
298 return closestDescendant->positionForPoint(LayoutPoint(absolutePoint));
299 }
300
276 // LayoutBox methods will expect coordinates w/o any transforms in coordinates 301 // LayoutBox methods will expect coordinates w/o any transforms in coordinates
277 // relative to our borderBox origin. This method gives us exactly that. 302 // relative to our borderBox origin. This method gives us exactly that.
278 void LayoutSVGRoot::buildLocalToBorderBoxTransform() 303 void LayoutSVGRoot::buildLocalToBorderBoxTransform()
279 { 304 {
280 SVGSVGElement* svg = toSVGSVGElement(node()); 305 SVGSVGElement* svg = toSVGSVGElement(node());
281 ASSERT(svg); 306 ASSERT(svg);
282 float scale = style()->effectiveZoom(); 307 float scale = style()->effectiveZoom();
283 FloatPoint translate = svg->currentTranslate(); 308 FloatPoint translate = svg->currentTranslate();
284 LayoutSize borderAndPadding(borderLeft() + paddingLeft(), borderTop() + padd ingTop()); 309 LayoutSize borderAndPadding(borderLeft() + paddingLeft(), borderTop() + padd ingTop());
285 m_localToBorderBoxTransform = svg->viewBoxToViewTransform(contentWidth() / s cale, contentHeight() / scale); 310 m_localToBorderBoxTransform = svg->viewBoxToViewTransform(contentWidth() / s cale, contentHeight() / scale);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 updateHitTestResult(result, pointInBorderBox); 426 updateHitTestResult(result, pointInBorderBox);
402 if (!result.addNodeToListBasedTestResult(node(), locationInContainer , boundsRect)) 427 if (!result.addNodeToListBasedTestResult(node(), locationInContainer , boundsRect))
403 return true; 428 return true;
404 } 429 }
405 } 430 }
406 431
407 return false; 432 return false;
408 } 433 }
409 434
410 } 435 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698