| 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 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org> |
| 5 * Copyright (C) 2006 Apple Computer, Inc | 5 * Copyright (C) 2006 Apple Computer, Inc |
| 6 * Copyright (C) 2009 Google, Inc. | 6 * Copyright (C) 2009 Google, Inc. |
| 7 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org> | 7 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org> |
| 8 * Copyright (C) 2011 University of Szeged | 8 * Copyright (C) 2011 University of Szeged |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 FloatRect m_strokeBoundingBox; | 125 FloatRect m_strokeBoundingBox; |
| 126 LayoutSVGShapeRareData& ensureRareData() const; | 126 LayoutSVGShapeRareData& ensureRareData() const; |
| 127 | 127 |
| 128 private: | 128 private: |
| 129 // Hit-detection separated for the fill and the stroke | 129 // Hit-detection separated for the fill and the stroke |
| 130 bool fillContains(const FloatPoint&, | 130 bool fillContains(const FloatPoint&, |
| 131 bool requiresFill = true, | 131 bool requiresFill = true, |
| 132 const WindRule fillRule = RULE_NONZERO); | 132 const WindRule fillRule = RULE_NONZERO); |
| 133 bool strokeContains(const FloatPoint&, bool requiresStroke = true); | 133 bool strokeContains(const FloatPoint&, bool requiresStroke = true); |
| 134 | 134 |
| 135 const AffineTransform& localToSVGParentTransform() const final { | |
| 136 return m_localTransform; | |
| 137 } | |
| 138 | |
| 139 bool isOfType(LayoutObjectType type) const override { | 135 bool isOfType(LayoutObjectType type) const override { |
| 140 return type == LayoutObjectSVGShape || LayoutSVGModelObject::isOfType(type); | 136 return type == LayoutObjectSVGShape || LayoutSVGModelObject::isOfType(type); |
| 141 } | 137 } |
| 142 void layout() final; | 138 void layout() final; |
| 143 void paint(const PaintInfo&, const LayoutPoint&) const final; | 139 void paint(const PaintInfo&, const LayoutPoint&) const final; |
| 144 void addOutlineRects(Vector<LayoutRect>&, | 140 void addOutlineRects(Vector<LayoutRect>&, |
| 145 const LayoutPoint& additionalOffset, | 141 const LayoutPoint& additionalOffset, |
| 146 IncludeBlockVisualOverflowOrNot) const final; | 142 IncludeBlockVisualOverflowOrNot) const final; |
| 147 | 143 |
| 148 bool nodeAtFloatPoint(HitTestResult&, | 144 bool nodeAtFloatPoint(HitTestResult&, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 166 bool m_needsBoundariesUpdate : 1; | 162 bool m_needsBoundariesUpdate : 1; |
| 167 bool m_needsShapeUpdate : 1; | 163 bool m_needsShapeUpdate : 1; |
| 168 bool m_needsTransformUpdate : 1; | 164 bool m_needsTransformUpdate : 1; |
| 169 }; | 165 }; |
| 170 | 166 |
| 171 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutSVGShape, isSVGShape()); | 167 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutSVGShape, isSVGShape()); |
| 172 | 168 |
| 173 } // namespace blink | 169 } // namespace blink |
| 174 | 170 |
| 175 #endif | 171 #endif |
| OLD | NEW |