Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Side by Side Diff: Source/core/rendering/svg/RenderSVGResourceMarker.cpp

Issue 23785014: [SVG] Resources should be laid out in dependecy order. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: text-layout-crash.html needs image result update. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 ASSERT(needsLayout());
50 if (m_isInLayout)
51 return;
52
53 TemporaryChange<bool> inLayoutChange(m_isInLayout, true);
54
48 // Invalidate all resources if our layout changed. 55 // Invalidate all resources if our layout changed.
49 if (everHadLayout() && selfNeedsLayout()) 56 if (everHadLayout() && selfNeedsLayout())
50 RenderSVGRoot::addResourceForClientInvalidation(this); 57 removeAllClientsFromCache();
51 58
52 // RenderSVGHiddenContainer overwrites layout(). We need the 59 // RenderSVGHiddenContainer overwrites layout(). We need the
53 // layouting of RenderSVGContainer for calculating local 60 // layouting of RenderSVGContainer for calculating local
54 // transformations and repaint. 61 // transformations and repaint.
55 RenderSVGContainer::layout(); 62 RenderSVGContainer::layout();
56 } 63 }
57 64
58 void RenderSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation ) 65 void RenderSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation )
59 { 66 {
60 markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInval idation : ParentOnlyInvalidation); 67 markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInval idation : ParentOnlyInvalidation);
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 SVGMarkerElement* marker = toSVGMarkerElement(element()); 176 SVGMarkerElement* marker = toSVGMarkerElement(element());
170 ASSERT(marker); 177 ASSERT(marker);
171 178
172 SVGLengthContext lengthContext(marker); 179 SVGLengthContext lengthContext(marker);
173 float w = marker->markerWidthCurrentValue().value(lengthContext); 180 float w = marker->markerWidthCurrentValue().value(lengthContext);
174 float h = marker->markerHeightCurrentValue().value(lengthContext); 181 float h = marker->markerHeightCurrentValue().value(lengthContext);
175 m_viewport = FloatRect(0, 0, w, h); 182 m_viewport = FloatRect(0, 0, w, h);
176 } 183 }
177 184
178 } 185 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceContainer.cpp ('k') | Source/core/rendering/svg/RenderSVGRoot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698