Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 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 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| 11 * This library is distributed in the hope that it will be useful, | 11 * This library is distributed in the hope that it will be useful, |
| 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 14 * Library General Public License for more details. | 14 * Library General Public License for more details. |
| 15 * | 15 * |
| 16 * You should have received a copy of the GNU Library General Public License | 16 * You should have received a copy of the GNU Library General Public License |
| 17 * along with this library; see the file COPYING.LIB. If not, write to | 17 * along with this library; see the file COPYING.LIB. If not, write to |
| 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 19 * Boston, MA 02110-1301, USA. | 19 * Boston, MA 02110-1301, USA. |
| 20 */ | 20 */ |
| 21 | 21 |
| 22 #include "config.h" | 22 #include "config.h" |
| 23 | 23 |
| 24 #include "core/rendering/svg/RenderSVGResourceMarker.h" | 24 #include "core/rendering/svg/RenderSVGResourceMarker.h" |
| 25 | 25 |
| 26 #include "core/platform/graphics/GraphicsContextStateSaver.h" | 26 #include "core/platform/graphics/GraphicsContextStateSaver.h" |
| 27 #include "core/rendering/svg/RenderSVGContainer.h" | 27 #include "core/rendering/svg/RenderSVGContainer.h" |
| 28 #include "core/rendering/svg/RenderSVGRoot.h" | |
| 29 #include "core/rendering/svg/SVGRenderSupport.h" | 28 #include "core/rendering/svg/SVGRenderSupport.h" |
| 30 #include "core/svg/SVGElement.h" | 29 #include "core/svg/SVGElement.h" |
| 31 #include "core/svg/SVGMarkerElement.h" | 30 #include "core/svg/SVGMarkerElement.h" |
| 32 | 31 |
| 32 #include "wtf/TemporaryChange.h" | |
| 33 | |
| 33 namespace WebCore { | 34 namespace WebCore { |
| 34 | 35 |
| 35 RenderSVGResourceType RenderSVGResourceMarker::s_resourceType = MarkerResourceTy pe; | 36 RenderSVGResourceType RenderSVGResourceMarker::s_resourceType = MarkerResourceTy pe; |
| 36 | 37 |
| 37 RenderSVGResourceMarker::RenderSVGResourceMarker(SVGMarkerElement* node) | 38 RenderSVGResourceMarker::RenderSVGResourceMarker(SVGMarkerElement* node) |
| 38 : RenderSVGResourceContainer(node) | 39 : RenderSVGResourceContainer(node) |
| 39 { | 40 { |
| 40 } | 41 } |
| 41 | 42 |
| 42 RenderSVGResourceMarker::~RenderSVGResourceMarker() | 43 RenderSVGResourceMarker::~RenderSVGResourceMarker() |
| 43 { | 44 { |
| 44 } | 45 } |
| 45 | 46 |
| 46 void RenderSVGResourceMarker::layout() | 47 void RenderSVGResourceMarker::layout() |
| 47 { | 48 { |
| 49 if (!needsLayout() || m_isInLayout) | |
|
pdr.
2013/09/23 22:26:02
Ditto on asserts
| |
| 50 return; | |
| 51 | |
| 52 TemporaryChange<bool> inLayoutChange(m_isInLayout, true); | |
| 53 | |
| 48 // Invalidate all resources if our layout changed. | 54 // Invalidate all resources if our layout changed. |
| 49 if (everHadLayout() && selfNeedsLayout()) | 55 if (everHadLayout() && selfNeedsLayout()) |
| 50 RenderSVGRoot::addResourceForClientInvalidation(this); | 56 removeAllClientsFromCache(); |
| 51 | 57 |
| 52 // RenderSVGHiddenContainer overwrites layout(). We need the | 58 // RenderSVGHiddenContainer overwrites layout(). We need the |
| 53 // layouting of RenderSVGContainer for calculating local | 59 // layouting of RenderSVGContainer for calculating local |
| 54 // transformations and repaint. | 60 // transformations and repaint. |
| 55 RenderSVGContainer::layout(); | 61 RenderSVGContainer::layout(); |
| 56 } | 62 } |
| 57 | 63 |
| 58 void RenderSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation ) | 64 void RenderSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation ) |
| 59 { | 65 { |
| 60 markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInval idation : ParentOnlyInvalidation); | 66 markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInval idation : ParentOnlyInvalidation); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 SVGMarkerElement* marker = toSVGMarkerElement(element()); | 175 SVGMarkerElement* marker = toSVGMarkerElement(element()); |
| 170 ASSERT(marker); | 176 ASSERT(marker); |
| 171 | 177 |
| 172 SVGLengthContext lengthContext(marker); | 178 SVGLengthContext lengthContext(marker); |
| 173 float w = marker->markerWidthCurrentValue().value(lengthContext); | 179 float w = marker->markerWidthCurrentValue().value(lengthContext); |
| 174 float h = marker->markerHeightCurrentValue().value(lengthContext); | 180 float h = marker->markerHeightCurrentValue().value(lengthContext); |
| 175 m_viewport = FloatRect(0, 0, w, h); | 181 m_viewport = FloatRect(0, 0, w, h); |
| 176 } | 182 } |
| 177 | 183 |
| 178 } | 184 } |
| OLD | NEW |