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

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

Issue 208313010: Replace raw pointers to GC allocated objects by members in stack allocated objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 25 matching lines...) Expand all
36 #include "core/rendering/style/StyleInheritedData.h" 36 #include "core/rendering/style/StyleInheritedData.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 class CSSAnimationUpdate; 40 class CSSAnimationUpdate;
41 class FontDescription; 41 class FontDescription;
42 class StyleRule; 42 class StyleRule;
43 43
44 class StyleResolverState { 44 class StyleResolverState {
45 STACK_ALLOCATED(); 45 STACK_ALLOCATED();
46 WTF_MAKE_NONCOPYABLE(StyleResolverState); 46 WTF_MAKE_NONCOPYABLE(StyleResolverState);
haraken 2014/03/24 07:05:03 Nit: Fix indentation.
zerny-chromium 2014/03/24 08:32:28 Done.
47 public: 47 public:
48 StyleResolverState(Document&, Element*, RenderStyle* parentStyle = 0); 48 StyleResolverState(Document&, Element*, RenderStyle* parentStyle = 0);
49 ~StyleResolverState(); 49 ~StyleResolverState();
50 50
51 // In FontFaceSet and CanvasRenderingContext2D, we don't have an element to grab the document from. 51 // In FontFaceSet and CanvasRenderingContext2D, we don't have an element to grab the document from.
52 // This is why we have to store the document separately. 52 // This is why we have to store the document separately.
53 Document& document() const { return m_document; } 53 Document& document() const { return m_document; }
54 // These are all just pass-through methods to ElementResolveContext. 54 // These are all just pass-through methods to ElementResolveContext.
55 Element* element() const { return m_elementContext.element(); } 55 Element* element() const { return m_elementContext.element(); }
56 const ContainerNode* parentNode() const { return m_elementContext.parentNode (); } 56 const ContainerNode* parentNode() const { return m_elementContext.parentNode (); }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 // m_parentStyle is not always just element->parentNode()->style() 152 // m_parentStyle is not always just element->parentNode()->style()
153 // so we keep it separate from m_elementContext. 153 // so we keep it separate from m_elementContext.
154 RefPtr<RenderStyle> m_parentStyle; 154 RefPtr<RenderStyle> m_parentStyle;
155 155
156 OwnPtr<CSSAnimationUpdate> m_animationUpdate; 156 OwnPtr<CSSAnimationUpdate> m_animationUpdate;
157 157
158 bool m_applyPropertyToRegularStyle; 158 bool m_applyPropertyToRegularStyle;
159 bool m_applyPropertyToVisitedLinkStyle; 159 bool m_applyPropertyToVisitedLinkStyle;
160 160
161 CSSValue* m_lineHeightValue; 161 RawPtrWillBeMember<CSSValue> m_lineHeightValue;
162 162
163 FontBuilder m_fontBuilder; 163 FontBuilder m_fontBuilder;
164 164
165 CachedUAStyle m_cachedUAStyle; 165 CachedUAStyle m_cachedUAStyle;
166 166
167 ElementStyleResources m_elementStyleResources; 167 ElementStyleResources m_elementStyleResources;
168 // CSSToStyleMap is a pure-logic class and only contains 168 // CSSToStyleMap is a pure-logic class and only contains
169 // a back-pointer to this object. 169 // a back-pointer to this object.
170 CSSToStyleMap m_styleMap; 170 CSSToStyleMap m_styleMap;
171 Vector<AtomicString> m_contentAttrValues; 171 Vector<AtomicString> m_contentAttrValues;
172 172
173 StyleRule* m_currentRule; 173 RawPtrWillBeMember<StyleRule> m_currentRule;
174 }; 174 };
175 175
176 } // namespace WebCore 176 } // namespace WebCore
177 177
178 #endif // StyleResolverState_h 178 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698