| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> | 2 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> |
| 3 * Copyright (C) 2006 Apple Computer, Inc. | 3 * Copyright (C) 2006 Apple Computer, Inc. |
| 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 5 * Copyright (C) 2007, 2008, 2009 Rob Buis <buis@kde.org> | 5 * Copyright (C) 2007, 2008, 2009 Rob Buis <buis@kde.org> |
| 6 * Copyright (C) 2009 Google, Inc. | 6 * Copyright (C) 2009 Google, Inc. |
| 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> | 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> |
| 8 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> | 8 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> |
| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 | 123 |
| 124 bool updateParentBoundaries = false; | 124 bool updateParentBoundaries = false; |
| 125 if (m_needsTransformUpdate) { | 125 if (m_needsTransformUpdate) { |
| 126 m_localTransform = | 126 m_localTransform = |
| 127 toSVGImageElement(element())->calculateAnimatedLocalTransform(); | 127 toSVGImageElement(element())->calculateAnimatedLocalTransform(); |
| 128 m_needsTransformUpdate = false; | 128 m_needsTransformUpdate = false; |
| 129 updateParentBoundaries = true; | 129 updateParentBoundaries = true; |
| 130 } | 130 } |
| 131 | 131 |
| 132 if (m_needsBoundariesUpdate) { | 132 if (m_needsBoundariesUpdate) { |
| 133 m_paintInvalidationBoundingBox = m_objectBoundingBox; | 133 m_localVisualRect = m_objectBoundingBox; |
| 134 SVGLayoutSupport::intersectPaintInvalidationRectWithResources( | 134 SVGLayoutSupport::adjustVisualRectWithResources(this, m_localVisualRect); |
| 135 this, m_paintInvalidationBoundingBox); | |
| 136 m_needsBoundariesUpdate = false; | 135 m_needsBoundariesUpdate = false; |
| 137 updateParentBoundaries = true; | 136 updateParentBoundaries = true; |
| 138 } | 137 } |
| 139 | 138 |
| 140 // If our bounds changed, notify the parents. | 139 // If our bounds changed, notify the parents. |
| 141 if (updateParentBoundaries) | 140 if (updateParentBoundaries) |
| 142 LayoutSVGModelObject::setNeedsBoundariesUpdate(); | 141 LayoutSVGModelObject::setNeedsBoundariesUpdate(); |
| 143 | 142 |
| 144 ASSERT(!m_needsBoundariesUpdate); | 143 ASSERT(!m_needsBoundariesUpdate); |
| 145 ASSERT(!m_needsTransformUpdate); | 144 ASSERT(!m_needsTransformUpdate); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 } | 194 } |
| 196 | 195 |
| 197 setShouldDoFullPaintInvalidation(); | 196 setShouldDoFullPaintInvalidation(); |
| 198 } | 197 } |
| 199 | 198 |
| 200 void LayoutSVGImage::addOutlineRects(Vector<LayoutRect>& rects, | 199 void LayoutSVGImage::addOutlineRects(Vector<LayoutRect>& rects, |
| 201 const LayoutPoint&, | 200 const LayoutPoint&, |
| 202 IncludeBlockVisualOverflowOrNot) const { | 201 IncludeBlockVisualOverflowOrNot) const { |
| 203 // this is called from paint() after the localTransform has already been | 202 // this is called from paint() after the localTransform has already been |
| 204 // applied | 203 // applied |
| 205 rects.append(LayoutRect(paintInvalidationRectInLocalSVGCoordinates())); | 204 rects.append(LayoutRect(visualRectInLocalSVGCoordinates())); |
| 206 } | 205 } |
| 207 | 206 |
| 208 } // namespace blink | 207 } // namespace blink |
| OLD | NEW |