| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde
.org> | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde
.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
| 5 * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved. | 5 * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved. |
| 6 * Copyright (C) 2012 University of Szeged | 6 * Copyright (C) 2012 University of Szeged |
| 7 * Copyright (C) 2012 Renata Hodovan <reni@webkit.org> | 7 * Copyright (C) 2012 Renata Hodovan <reni@webkit.org> |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 | 216 |
| 217 SVGElement::InvalidationGuard invalidationGuard(this); | 217 SVGElement::InvalidationGuard invalidationGuard(this); |
| 218 | 218 |
| 219 if (attrName == SVGNames::xAttr | 219 if (attrName == SVGNames::xAttr |
| 220 || attrName == SVGNames::yAttr) { | 220 || attrName == SVGNames::yAttr) { |
| 221 invalidateSVGPresentationAttributeStyle(); | 221 invalidateSVGPresentationAttributeStyle(); |
| 222 setNeedsStyleRecalc(LocalStyleChange, | 222 setNeedsStyleRecalc(LocalStyleChange, |
| 223 StyleChangeReasonForTracing::fromAttribute(attrName)); | 223 StyleChangeReasonForTracing::fromAttribute(attrName)); |
| 224 } | 224 } |
| 225 | 225 |
| 226 LayoutObject* renderer = this->renderer(); | 226 LayoutObject* renderer = this->layoutObject(); |
| 227 if (attrName == SVGNames::xAttr | 227 if (attrName == SVGNames::xAttr |
| 228 || attrName == SVGNames::yAttr | 228 || attrName == SVGNames::yAttr |
| 229 || attrName == SVGNames::widthAttr | 229 || attrName == SVGNames::widthAttr |
| 230 || attrName == SVGNames::heightAttr) { | 230 || attrName == SVGNames::heightAttr) { |
| 231 updateRelativeLengthsInformation(); | 231 updateRelativeLengthsInformation(); |
| 232 if (m_targetElementInstance) { | 232 if (m_targetElementInstance) { |
| 233 ASSERT(m_targetElementInstance->correspondingElement()); | 233 ASSERT(m_targetElementInstance->correspondingElement()); |
| 234 transferUseWidthAndHeightIfNeeded(*this, m_targetElementInstance.get
(), *m_targetElementInstance->correspondingElement()); | 234 transferUseWidthAndHeightIfNeeded(*this, m_targetElementInstance.get
(), *m_targetElementInstance->correspondingElement()); |
| 235 } | 235 } |
| 236 if (renderer) | 236 if (renderer) |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 path.translate(FloatSize(m_x->currentValue()->value(lengthContext),
m_y->currentValue()->value(lengthContext))); | 480 path.translate(FloatSize(m_x->currentValue()->value(lengthContext),
m_y->currentValue()->value(lengthContext))); |
| 481 path.transform(calculateAnimatedLocalTransform()); | 481 path.transform(calculateAnimatedLocalTransform()); |
| 482 } | 482 } |
| 483 } | 483 } |
| 484 } | 484 } |
| 485 | 485 |
| 486 LayoutObject* SVGUseElement::rendererClipChild() const | 486 LayoutObject* SVGUseElement::rendererClipChild() const |
| 487 { | 487 { |
| 488 if (Node* n = closedShadowRoot()->firstChild()) { | 488 if (Node* n = closedShadowRoot()->firstChild()) { |
| 489 if (n->isSVGElement() && isDirectReference(toSVGElement(*n))) | 489 if (n->isSVGElement() && isDirectReference(toSVGElement(*n))) |
| 490 return n->renderer(); | 490 return n->layoutObject(); |
| 491 } | 491 } |
| 492 | 492 |
| 493 return 0; | 493 return 0; |
| 494 } | 494 } |
| 495 | 495 |
| 496 bool SVGUseElement::buildShadowTree(SVGElement* target, SVGElement* targetInstan
ce, bool foundUse) | 496 bool SVGUseElement::buildShadowTree(SVGElement* target, SVGElement* targetInstan
ce, bool foundUse) |
| 497 { | 497 { |
| 498 ASSERT(target); | 498 ASSERT(target); |
| 499 ASSERT(targetInstance); | 499 ASSERT(targetInstance); |
| 500 | 500 |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 | 787 |
| 788 if (m_resource) | 788 if (m_resource) |
| 789 m_resource->removeClient(this); | 789 m_resource->removeClient(this); |
| 790 | 790 |
| 791 m_resource = resource; | 791 m_resource = resource; |
| 792 if (m_resource) | 792 if (m_resource) |
| 793 m_resource->addClient(this); | 793 m_resource->addClient(this); |
| 794 } | 794 } |
| 795 | 795 |
| 796 } | 796 } |
| OLD | NEW |