Chromium Code Reviews Chromium Code Reviews
Issue 745383007:
Fix an issue where hit detection could fail on rect and ellipse shapes (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 University of Szeged | 2 * Copyright (C) 2011 University of Szeged |
| 3 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org> | 3 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org> |
| 4 * All rights reserved. | 4 * All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 | 32 |
| 33 namespace blink { | 33 namespace blink { |
| 34 | 34 |
| 35 class RenderSVGRect final : public RenderSVGShape { | 35 class RenderSVGRect final : public RenderSVGShape { |
| 36 public: | 36 public: |
| 37 explicit RenderSVGRect(SVGRectElement*); | 37 explicit RenderSVGRect(SVGRectElement*); |
| 38 virtual ~RenderSVGRect(); | 38 virtual ~RenderSVGRect(); |
| 39 | 39 |
| 40 virtual ShapeGeometryCodePath geometryCodePath() const override { return m_u sePathFallback ? PathGeometry : RectGeometryFastPath; } | 40 virtual ShapeGeometryCodePath geometryCodePath() const override { return m_u sePathFallback ? PathGeometry : RectGeometryFastPath; } |
| 41 | 41 |
| 42 private: | |
| 43 virtual const char* renderName() const override { return "RenderSVGRect"; } | 42 virtual const char* renderName() const override { return "RenderSVGRect"; } |
| 44 | 43 |
| 44 protected: | |
|
fs
2014/12/04 13:10:35
Same as for RenderSVGEllipse.
| |
| 45 virtual void updateShapeFromElement() override; | 45 virtual void updateShapeFromElement() override; |
| 46 virtual bool isShapeEmpty() const override { return m_usePathFallback ? Rend erSVGShape::isShapeEmpty() : m_fillBoundingBox.isEmpty(); } | 46 virtual bool isShapeEmpty() const override { return m_usePathFallback ? Rend erSVGShape::isShapeEmpty() : m_fillBoundingBox.isEmpty(); } |
| 47 virtual bool shapeDependentStrokeContains(const FloatPoint&) override; | 47 virtual bool shapeDependentStrokeContains(const FloatPoint&) override; |
| 48 virtual bool shapeDependentFillContains(const FloatPoint&, const WindRule) c onst override; | 48 virtual bool shapeDependentFillContains(const FloatPoint&, const WindRule) c onst override; |
| 49 | 49 |
| 50 private: | 50 private: |
| 51 bool hasSimpleStroke() const; | |
| 52 | |
| 53 private: | |
| 51 FloatRect m_innerStrokeRect; | 54 FloatRect m_innerStrokeRect; |
| 52 FloatRect m_outerStrokeRect; | 55 FloatRect m_outerStrokeRect; |
| 53 bool m_usePathFallback; | 56 bool m_usePathFallback; |
| 54 }; | 57 }; |
| 55 | 58 |
| 56 } | 59 } |
| 57 | 60 |
| 58 #endif | 61 #endif |
| OLD | NEW |
