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

Side by Side Diff: Source/core/css/resolver/StyleResolverParentScope.h

Issue 1278103002: Oilpan: tidy up some inter-stack object references. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use STACK_ALLOCATED() more often Created 5 years, 4 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
« no previous file with comments | « Source/core/css/resolver/SharedStyleFinder.cpp ('k') | Source/modules/crypto/CryptoKey.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef StyleResolverParentScope_h 5 #ifndef StyleResolverParentScope_h
6 #define StyleResolverParentScope_h 6 #define StyleResolverParentScope_h
7 7
8 #include "core/css/resolver/StyleResolver.h" 8 #include "core/css/resolver/StyleResolver.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/dom/Element.h" 10 #include "core/dom/Element.h"
(...skipping 10 matching lines...) Expand all
21 21
22 static void ensureParentStackIsPushed(); 22 static void ensureParentStackIsPushed();
23 23
24 private: 24 private:
25 void pushParentIfNeeded(); 25 void pushParentIfNeeded();
26 Node& parent() const { return *m_parent; } 26 Node& parent() const { return *m_parent; }
27 27
28 RawPtrWillBeMember<Node> m_parent; 28 RawPtrWillBeMember<Node> m_parent;
29 bool m_pushed; 29 bool m_pushed;
30 StyleResolverParentScope* m_previous; 30 StyleResolverParentScope* m_previous;
31 StyleResolver& m_resolver; 31 RawPtrWillBeMember<StyleResolver> m_resolver;
32 32
33 static StyleResolverParentScope* s_currentScope; 33 static StyleResolverParentScope* s_currentScope;
34 }; 34 };
35 35
36 inline StyleResolverParentScope::StyleResolverParentScope(Node& parent) 36 inline StyleResolverParentScope::StyleResolverParentScope(Node& parent)
37 : m_parent(parent) 37 : m_parent(parent)
38 , m_pushed(false) 38 , m_pushed(false)
39 , m_previous(s_currentScope) 39 , m_previous(s_currentScope)
40 , m_resolver(*parent.document().styleResolver()) 40 , m_resolver(parent.document().styleResolver())
41 { 41 {
42 ASSERT(parent.document().inStyleRecalc()); 42 ASSERT(parent.document().inStyleRecalc());
43 ASSERT(parent.isElementNode() || parent.isShadowRoot()); 43 ASSERT(parent.isElementNode() || parent.isShadowRoot());
44 s_currentScope = this; 44 s_currentScope = this;
45 m_resolver.increaseStyleSharingDepth(); 45 m_resolver->increaseStyleSharingDepth();
46 } 46 }
47 47
48 inline StyleResolverParentScope::~StyleResolverParentScope() 48 inline StyleResolverParentScope::~StyleResolverParentScope()
49 { 49 {
50 s_currentScope = m_previous; 50 s_currentScope = m_previous;
51 m_resolver.decreaseStyleSharingDepth(); 51 m_resolver->decreaseStyleSharingDepth();
52 if (!m_pushed) 52 if (!m_pushed)
53 return; 53 return;
54 if (parent().isElementNode()) 54 if (parent().isElementNode())
55 m_resolver.popParentElement(toElement(parent())); 55 m_resolver->popParentElement(toElement(parent()));
56 } 56 }
57 57
58 inline void StyleResolverParentScope::ensureParentStackIsPushed() 58 inline void StyleResolverParentScope::ensureParentStackIsPushed()
59 { 59 {
60 if (s_currentScope) 60 if (s_currentScope)
61 s_currentScope->pushParentIfNeeded(); 61 s_currentScope->pushParentIfNeeded();
62 } 62 }
63 63
64 inline void StyleResolverParentScope::pushParentIfNeeded() 64 inline void StyleResolverParentScope::pushParentIfNeeded()
65 { 65 {
66 if (m_pushed) 66 if (m_pushed)
67 return; 67 return;
68 if (m_previous) 68 if (m_previous)
69 m_previous->pushParentIfNeeded(); 69 m_previous->pushParentIfNeeded();
70 if (parent().isElementNode()) 70 if (parent().isElementNode())
71 m_resolver.pushParentElement(toElement(parent())); 71 m_resolver->pushParentElement(toElement(parent()));
72 m_pushed = true; 72 m_pushed = true;
73 } 73 }
74 74
75 } // namespace blink 75 } // namespace blink
76 76
77 #endif // StyleResolverParentScope_h 77 #endif // StyleResolverParentScope_h
OLDNEW
« no previous file with comments | « Source/core/css/resolver/SharedStyleFinder.cpp ('k') | Source/modules/crypto/CryptoKey.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698