| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2009, Google Inc. All rights reserved. | 2 * Copyright (c) 2009, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/rendering/svg/RenderSVGModelObject.h" | 32 #include "core/layout/svg/LayoutSVGModelObject.h" |
| 33 | 33 |
| 34 #include "core/layout/Layer.h" | 34 #include "core/layout/Layer.h" |
| 35 #include "core/layout/svg/LayoutSVGContainer.h" | 35 #include "core/layout/svg/LayoutSVGContainer.h" |
| 36 #include "core/layout/svg/LayoutSVGRoot.h" |
| 36 #include "core/layout/svg/SVGLayoutSupport.h" | 37 #include "core/layout/svg/SVGLayoutSupport.h" |
| 37 #include "core/layout/svg/SVGResourcesCache.h" | 38 #include "core/layout/svg/SVGResourcesCache.h" |
| 38 #include "core/rendering/RenderView.h" | 39 #include "core/rendering/RenderView.h" |
| 39 #include "core/rendering/svg/RenderSVGRoot.h" | |
| 40 #include "core/svg/SVGGraphicsElement.h" | 40 #include "core/svg/SVGGraphicsElement.h" |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 RenderSVGModelObject::RenderSVGModelObject(SVGElement* node) | 44 LayoutSVGModelObject::LayoutSVGModelObject(SVGElement* node) |
| 45 : LayoutObject(node) | 45 : LayoutObject(node) |
| 46 { | 46 { |
| 47 } | 47 } |
| 48 | 48 |
| 49 bool RenderSVGModelObject::isChildAllowed(LayoutObject* child, const LayoutStyle
&) const | 49 bool LayoutSVGModelObject::isChildAllowed(LayoutObject* child, const LayoutStyle
&) const |
| 50 { | 50 { |
| 51 return child->isSVG() && !(child->isSVGInline() || child->isSVGInlineText())
; | 51 return child->isSVG() && !(child->isSVGInline() || child->isSVGInlineText())
; |
| 52 } | 52 } |
| 53 | 53 |
| 54 LayoutRect RenderSVGModelObject::clippedOverflowRectForPaintInvalidation(const L
ayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState*
paintInvalidationState) const | 54 LayoutRect LayoutSVGModelObject::clippedOverflowRectForPaintInvalidation(const L
ayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState*
paintInvalidationState) const |
| 55 { | 55 { |
| 56 return SVGLayoutSupport::clippedOverflowRectForPaintInvalidation(this, paint
InvalidationContainer, paintInvalidationState); | 56 return SVGLayoutSupport::clippedOverflowRectForPaintInvalidation(this, paint
InvalidationContainer, paintInvalidationState); |
| 57 } | 57 } |
| 58 | 58 |
| 59 void RenderSVGModelObject::mapLocalToContainer(const LayoutLayerModelObject* pai
ntInvalidationContainer, TransformState& transformState, MapCoordinatesFlags, bo
ol* wasFixed, const PaintInvalidationState* paintInvalidationState) const | 59 void LayoutSVGModelObject::mapLocalToContainer(const LayoutLayerModelObject* pai
ntInvalidationContainer, TransformState& transformState, MapCoordinatesFlags, bo
ol* wasFixed, const PaintInvalidationState* paintInvalidationState) const |
| 60 { | 60 { |
| 61 SVGLayoutSupport::mapLocalToContainer(this, paintInvalidationContainer, tran
sformState, wasFixed, paintInvalidationState); | 61 SVGLayoutSupport::mapLocalToContainer(this, paintInvalidationContainer, tran
sformState, wasFixed, paintInvalidationState); |
| 62 } | 62 } |
| 63 | 63 |
| 64 const LayoutObject* RenderSVGModelObject::pushMappingToContainer(const LayoutLay
erModelObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const | 64 const LayoutObject* LayoutSVGModelObject::pushMappingToContainer(const LayoutLay
erModelObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const |
| 65 { | 65 { |
| 66 return SVGLayoutSupport::pushMappingToContainer(this, ancestorToStopAt, geom
etryMap); | 66 return SVGLayoutSupport::pushMappingToContainer(this, ancestorToStopAt, geom
etryMap); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void RenderSVGModelObject::absoluteRects(Vector<IntRect>& rects, const LayoutPoi
nt& accumulatedOffset) const | 69 void LayoutSVGModelObject::absoluteRects(Vector<IntRect>& rects, const LayoutPoi
nt& accumulatedOffset) const |
| 70 { | 70 { |
| 71 IntRect rect = enclosingIntRect(strokeBoundingBox()); | 71 IntRect rect = enclosingIntRect(strokeBoundingBox()); |
| 72 rect.moveBy(roundedIntPoint(accumulatedOffset)); | 72 rect.moveBy(roundedIntPoint(accumulatedOffset)); |
| 73 rects.append(rect); | 73 rects.append(rect); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void RenderSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixe
d) const | 76 void LayoutSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixe
d) const |
| 77 { | 77 { |
| 78 quads.append(localToAbsoluteQuad(strokeBoundingBox(), 0 /* mode */, wasFixed
)); | 78 quads.append(localToAbsoluteQuad(strokeBoundingBox(), 0 /* mode */, wasFixed
)); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void RenderSVGModelObject::willBeDestroyed() | 81 void LayoutSVGModelObject::willBeDestroyed() |
| 82 { | 82 { |
| 83 SVGResourcesCache::clientDestroyed(this); | 83 SVGResourcesCache::clientDestroyed(this); |
| 84 LayoutObject::willBeDestroyed(); | 84 LayoutObject::willBeDestroyed(); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void RenderSVGModelObject::computeLayerHitTestRects(LayerHitTestRects& rects) co
nst | 87 void LayoutSVGModelObject::computeLayerHitTestRects(LayerHitTestRects& rects) co
nst |
| 88 { | 88 { |
| 89 // Using just the rect for the SVGRoot is good enough for now. | 89 // Using just the rect for the SVGRoot is good enough for now. |
| 90 SVGLayoutSupport::findTreeRootObject(this)->computeLayerHitTestRects(rects); | 90 SVGLayoutSupport::findTreeRootObject(this)->computeLayerHitTestRects(rects); |
| 91 } | 91 } |
| 92 | 92 |
| 93 void RenderSVGModelObject::addLayerHitTestRects(LayerHitTestRects&, const Layer*
currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect)
const | 93 void LayoutSVGModelObject::addLayerHitTestRects(LayerHitTestRects&, const Layer*
currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect)
const |
| 94 { | 94 { |
| 95 // We don't walk into SVG trees at all - just report their container. | 95 // We don't walk into SVG trees at all - just report their container. |
| 96 } | 96 } |
| 97 | 97 |
| 98 void RenderSVGModelObject::styleDidChange(StyleDifference diff, const LayoutStyl
e* oldStyle) | 98 void LayoutSVGModelObject::styleDidChange(StyleDifference diff, const LayoutStyl
e* oldStyle) |
| 99 { | 99 { |
| 100 if (diff.needsFullLayout()) { | 100 if (diff.needsFullLayout()) { |
| 101 setNeedsBoundariesUpdate(); | 101 setNeedsBoundariesUpdate(); |
| 102 if (style()->hasTransform()) | 102 if (style()->hasTransform()) |
| 103 setNeedsTransformUpdate(); | 103 setNeedsTransformUpdate(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 if (isBlendingAllowed()) { | 106 if (isBlendingAllowed()) { |
| 107 bool hasBlendModeChanged = (oldStyle && oldStyle->hasBlendMode()) == !st
yle()->hasBlendMode(); | 107 bool hasBlendModeChanged = (oldStyle && oldStyle->hasBlendMode()) == !st
yle()->hasBlendMode(); |
| 108 if (parent() && hasBlendModeChanged) | 108 if (parent() && hasBlendModeChanged) |
| 109 parent()->descendantIsolationRequirementsChanged(style()->hasBlendMo
de() ? DescendantIsolationRequired : DescendantIsolationNeedsUpdate); | 109 parent()->descendantIsolationRequirementsChanged(style()->hasBlendMo
de() ? DescendantIsolationRequired : DescendantIsolationNeedsUpdate); |
| 110 } | 110 } |
| 111 | 111 |
| 112 LayoutObject::styleDidChange(diff, oldStyle); | 112 LayoutObject::styleDidChange(diff, oldStyle); |
| 113 SVGResourcesCache::clientStyleChanged(this, diff, styleRef()); | 113 SVGResourcesCache::clientStyleChanged(this, diff, styleRef()); |
| 114 } | 114 } |
| 115 | 115 |
| 116 bool RenderSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, co
nst HitTestLocation&, const LayoutPoint&, HitTestAction) | 116 bool LayoutSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, co
nst HitTestLocation&, const LayoutPoint&, HitTestAction) |
| 117 { | 117 { |
| 118 ASSERT_NOT_REACHED(); | 118 ASSERT_NOT_REACHED(); |
| 119 return false; | 119 return false; |
| 120 } | 120 } |
| 121 | 121 |
| 122 // The SVG addFocusRingRects() method adds rects in local coordinates so the def
ault absoluteFocusRingBoundingBoxRect | 122 // The SVG addFocusRingRects() method adds rects in local coordinates so the def
ault absoluteFocusRingBoundingBoxRect |
| 123 // returns incorrect values for SVG objects. Overriding this method provides acc
ess to the absolute bounds. | 123 // returns incorrect values for SVG objects. Overriding this method provides acc
ess to the absolute bounds. |
| 124 IntRect RenderSVGModelObject::absoluteFocusRingBoundingBoxRect() const | 124 IntRect LayoutSVGModelObject::absoluteFocusRingBoundingBoxRect() const |
| 125 { | 125 { |
| 126 return localToAbsoluteQuad(FloatQuad(paintInvalidationRectInLocalCoordinates
())).enclosingBoundingBox(); | 126 return localToAbsoluteQuad(FloatQuad(paintInvalidationRectInLocalCoordinates
())).enclosingBoundingBox(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 void RenderSVGModelObject::invalidateTreeIfNeeded(const PaintInvalidationState&
paintInvalidationState) | 129 void LayoutSVGModelObject::invalidateTreeIfNeeded(const PaintInvalidationState&
paintInvalidationState) |
| 130 { | 130 { |
| 131 ASSERT(!needsLayout()); | 131 ASSERT(!needsLayout()); |
| 132 | 132 |
| 133 // If we didn't need paint invalidation then our children don't need as well
. | 133 // If we didn't need paint invalidation then our children don't need as well
. |
| 134 // Skip walking down the tree as everything should be fine below us. | 134 // Skip walking down the tree as everything should be fine below us. |
| 135 if (!shouldCheckForPaintInvalidation(paintInvalidationState)) | 135 if (!shouldCheckForPaintInvalidation(paintInvalidationState)) |
| 136 return; | 136 return; |
| 137 | 137 |
| 138 invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationState.paint
InvalidationContainer()); | 138 invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationState.paint
InvalidationContainer()); |
| 139 clearPaintInvalidationState(paintInvalidationState); | 139 clearPaintInvalidationState(paintInvalidationState); |
| 140 | 140 |
| 141 PaintInvalidationState childPaintInvalidationState(paintInvalidationState, *
this); | 141 PaintInvalidationState childPaintInvalidationState(paintInvalidationState, *
this); |
| 142 invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState); | 142 invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState); |
| 143 } | 143 } |
| 144 | 144 |
| 145 } // namespace blink | 145 } // namespace blink |
| OLD | NEW |