WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderSVGText.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Apple Computer, Inc.
  *               2006 Alexander Kellett <lypanov@kde.org>
  *               2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  *               2007 Nikolas Zimmermann <zimmermann@kde.org>
  *               2008 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 100 matching lines @@
 
 bool RenderSVGText::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
 {
     PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, style()->pointerEvents());
     bool isVisible = (style()->visibility() == VISIBLE);
     if (isVisible || !hitRules.requireVisible) {
         if ((hitRules.canHitStroke && (style()->svgStyle()->hasStroke() || !hitRules.requireStroke))
             || (hitRules.canHitFill && (style()->svgStyle()->hasFill() || !hitRules.requireFill))) {
             TransformationMatrix totalTransform = absoluteTransform();
             double localX, localY;
-            totalTransform.inverse().map(_x, _y, &localX, &localY);
+            totalTransform.inverse().map(_x, _y, localX, localY);
             FloatPoint hitPoint(_x, _y);
             return RenderBlock::nodeAtPoint(request, result, (int)localX, (int)localY, _tx, _ty, hitTestAction);
         }
     }
 
     return false;
 }
 
 void RenderSVGText::absoluteRects(Vector<IntRect>& rects, int, int, bool)
 {
@@ skipping 83 matching lines @@
 
     repaintRect.move(x(), y());
     return repaintRect;
 }
 
 }
 
 #endif // ENABLE(SVG)
 
 // vim:ts=4:noet