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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp

Issue 2151933003: Change WTF::TemporaryChange to be an alias for AutoReset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TemporaryChange -> AutoReset Created 4 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #include "core/layout/svg/LayoutSVGResourceContainer.h" 20 #include "core/layout/svg/LayoutSVGResourceContainer.h"
21 21
22 #include "core/SVGElementTypeHelpers.h" 22 #include "core/SVGElementTypeHelpers.h"
23 #include "core/layout/svg/LayoutSVGResourceClipper.h" 23 #include "core/layout/svg/LayoutSVGResourceClipper.h"
24 #include "core/layout/svg/LayoutSVGResourceFilter.h" 24 #include "core/layout/svg/LayoutSVGResourceFilter.h"
25 #include "core/layout/svg/LayoutSVGResourceMasker.h" 25 #include "core/layout/svg/LayoutSVGResourceMasker.h"
26 #include "core/layout/svg/SVGResources.h" 26 #include "core/layout/svg/SVGResources.h"
27 #include "core/layout/svg/SVGResourcesCache.h" 27 #include "core/layout/svg/SVGResourcesCache.h"
28 #include "core/paint/PaintLayer.h" 28 #include "core/paint/PaintLayer.h"
29 29
30 #include "wtf/TemporaryChange.h" 30 #include "wtf/AutoReset.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 static inline SVGDocumentExtensions& svgExtensionsFromElement(Element* element) 34 static inline SVGDocumentExtensions& svgExtensionsFromElement(Element* element)
35 { 35 {
36 ASSERT(element); 36 ASSERT(element);
37 return element->document().accessSVGExtensions(); 37 return element->document().accessSVGExtensions();
38 } 38 }
39 39
40 LayoutSVGResourceContainer::LayoutSVGResourceContainer(SVGElement* node) 40 LayoutSVGResourceContainer::LayoutSVGResourceContainer(SVGElement* node)
(...skipping 11 matching lines...) Expand all
52 } 52 }
53 53
54 void LayoutSVGResourceContainer::layout() 54 void LayoutSVGResourceContainer::layout()
55 { 55 {
56 // FIXME: Investigate a way to detect and break resource layout dependency c ycles early. 56 // FIXME: Investigate a way to detect and break resource layout dependency c ycles early.
57 // Then we can remove this method altogether, and fall back onto LayoutSVGHi ddenContainer::layout(). 57 // Then we can remove this method altogether, and fall back onto LayoutSVGHi ddenContainer::layout().
58 ASSERT(needsLayout()); 58 ASSERT(needsLayout());
59 if (m_isInLayout) 59 if (m_isInLayout)
60 return; 60 return;
61 61
62 TemporaryChange<bool> inLayoutChange(m_isInLayout, true); 62 AutoReset<bool> inLayoutChange(&m_isInLayout, true);
63 63
64 LayoutSVGHiddenContainer::layout(); 64 LayoutSVGHiddenContainer::layout();
65 65
66 clearInvalidationMask(); 66 clearInvalidationMask();
67 } 67 }
68 68
69 void LayoutSVGResourceContainer::willBeDestroyed() 69 void LayoutSVGResourceContainer::willBeDestroyed()
70 { 70 {
71 // Detach all clients referring to this resource. If the resource itself is 71 // Detach all clients referring to this resource. If the resource itself is
72 // a client, it will be detached from any such resources by the call to 72 // a client, it will be detached from any such resources by the call to
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 // This will process the rest of the ancestors. 320 // This will process the rest of the ancestors.
321 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache(); 321 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache();
322 break; 322 break;
323 } 323 }
324 324
325 current = current->parent(); 325 current = current->parent();
326 } 326 }
327 } 327 }
328 328
329 } // namespace blink 329 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698