OLD | NEW |
---|---|
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 Loading... | |
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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
274 LayoutReplaced::insertedIntoTree(); | 275 LayoutReplaced::insertedIntoTree(); |
275 SVGResourcesCache::clientWasAddedToTree(this, styleRef()); | 276 SVGResourcesCache::clientWasAddedToTree(this, styleRef()); |
276 } | 277 } |
277 | 278 |
278 void LayoutSVGRoot::willBeRemovedFromTree() | 279 void LayoutSVGRoot::willBeRemovedFromTree() |
279 { | 280 { |
280 SVGResourcesCache::clientWillBeRemovedFromTree(this); | 281 SVGResourcesCache::clientWillBeRemovedFromTree(this); |
281 LayoutReplaced::willBeRemovedFromTree(); | 282 LayoutReplaced::willBeRemovedFromTree(); |
282 } | 283 } |
283 | 284 |
285 PositionWithAffinity LayoutSVGRoot::positionForPoint(const LayoutPoint& point) | |
286 { | |
287 FloatPoint absolutePoint = FloatPoint(point); | |
288 absolutePoint = m_localToBorderBoxTransform.inverse().mapPoint(absolutePoint ); | |
289 LayoutObject* closestDescendant = SVGLayoutSupport::findSelectedLayoutSVGTex t(this, absolutePoint); | |
290 | |
291 if (!closestDescendant) | |
292 return LayoutReplaced::positionForPoint(point); | |
293 | |
294 LayoutObject* layoutObject = closestDescendant; | |
295 AffineTransform transform; | |
296 while (layoutObject) { | |
fs
2016/01/18 12:44:11
The computation done by this loop does not look co
| |
297 layoutObject = layoutObject->parent(); | |
298 if (layoutObject->isSVGRoot()) | |
299 break; | |
300 transform = layoutObject->localToParentTransform() * transform; | |
301 } | |
302 | |
303 AffineTransform closestDescendantTransform; | |
304 if (toLayoutSVGText(closestDescendant)->location().x()) | |
fs
2016/01/18 12:44:11
I don't see why this is needed.
hyunjunekim2
2016/01/18 13:32:48
It needs codes. Because the transform is not appli
fs
2016/01/18 13:56:23
Ah, this is compensating for the reverse thing in
| |
305 closestDescendantTransform.setE(toLayoutSVGText(closestDescendant)->loca tion().x()); | |
306 if (toLayoutSVGText(closestDescendant)->location().y()) | |
307 closestDescendantTransform.setF(toLayoutSVGText(closestDescendant)->loca tion().y()); | |
308 | |
309 transform = transform * closestDescendantTransform; | |
310 | |
311 absolutePoint = transform.inverse().mapPoint(absolutePoint); | |
312 if (absolutePoint.x() < 0) | |
fs
2016/01/18 12:44:11
Suggest to push this down into the callee chain.
| |
313 absolutePoint.setX(0); | |
314 if (absolutePoint.y() < 0) | |
315 absolutePoint.setY(0); | |
316 | |
317 return closestDescendant->positionForPoint(LayoutPoint(absolutePoint.x(), ab solutePoint.y())); | |
fs
2016/01/18 12:44:11
LayoutPoint(absolutePoint) should work just fine.
| |
318 } | |
319 | |
284 // LayoutBox methods will expect coordinates w/o any transforms in coordinates | 320 // LayoutBox methods will expect coordinates w/o any transforms in coordinates |
285 // relative to our borderBox origin. This method gives us exactly that. | 321 // relative to our borderBox origin. This method gives us exactly that. |
286 void LayoutSVGRoot::buildLocalToBorderBoxTransform() | 322 void LayoutSVGRoot::buildLocalToBorderBoxTransform() |
287 { | 323 { |
288 SVGSVGElement* svg = toSVGSVGElement(node()); | 324 SVGSVGElement* svg = toSVGSVGElement(node()); |
289 ASSERT(svg); | 325 ASSERT(svg); |
290 float scale = style()->effectiveZoom(); | 326 float scale = style()->effectiveZoom(); |
291 FloatPoint translate = svg->currentTranslate(); | 327 FloatPoint translate = svg->currentTranslate(); |
292 LayoutSize borderAndPadding(borderLeft() + paddingLeft(), borderTop() + padd ingTop()); | 328 LayoutSize borderAndPadding(borderLeft() + paddingLeft(), borderTop() + padd ingTop()); |
293 m_localToBorderBoxTransform = svg->viewBoxToViewTransform(contentWidth() / s cale, contentHeight() / scale); | 329 m_localToBorderBoxTransform = svg->viewBoxToViewTransform(contentWidth() / s cale, contentHeight() / scale); |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
409 updateHitTestResult(result, pointInBorderBox); | 445 updateHitTestResult(result, pointInBorderBox); |
410 if (!result.addNodeToListBasedTestResult(node(), locationInContainer , boundsRect)) | 446 if (!result.addNodeToListBasedTestResult(node(), locationInContainer , boundsRect)) |
411 return true; | 447 return true; |
412 } | 448 } |
413 } | 449 } |
414 | 450 |
415 return false; | 451 return false; |
416 } | 452 } |
417 | 453 |
418 } | 454 } |
OLD | NEW |