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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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) 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 18 matching lines...) Expand all
29 #include "core/css/CSSToLengthConversionData.h" 29 #include "core/css/CSSToLengthConversionData.h"
30 #include "core/css/resolver/CSSToStyleMap.h" 30 #include "core/css/resolver/CSSToStyleMap.h"
31 #include "core/css/resolver/ElementResolveContext.h" 31 #include "core/css/resolver/ElementResolveContext.h"
32 #include "core/css/resolver/ElementStyleResources.h" 32 #include "core/css/resolver/ElementStyleResources.h"
33 #include "core/css/resolver/FontBuilder.h" 33 #include "core/css/resolver/FontBuilder.h"
34 #include "core/dom/Document.h" 34 #include "core/dom/Document.h"
35 #include "core/dom/Element.h" 35 #include "core/dom/Element.h"
36 #include "core/style/CachedUAStyle.h" 36 #include "core/style/CachedUAStyle.h"
37 #include "core/style/ComputedStyle.h" 37 #include "core/style/ComputedStyle.h"
38 #include "core/style/StyleInheritedData.h" 38 #include "core/style/StyleInheritedData.h"
39 #include <memory>
39 40
40 namespace blink { 41 namespace blink {
41 42
42 class FontDescription; 43 class FontDescription;
43 44
44 class CORE_EXPORT StyleResolverState { 45 class CORE_EXPORT StyleResolverState {
45 STACK_ALLOCATED(); 46 STACK_ALLOCATED();
46 WTF_MAKE_NONCOPYABLE(StyleResolverState); 47 WTF_MAKE_NONCOPYABLE(StyleResolverState);
47 public: 48 public:
48 StyleResolverState(Document&, const ElementResolveContext&, const ComputedSt yle* parentStyle); 49 StyleResolverState(Document&, const ElementResolveContext&, const ComputedSt yle* parentStyle);
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 RefPtr<ComputedStyle> m_parentStyle; 174 RefPtr<ComputedStyle> m_parentStyle;
174 175
175 CSSAnimationUpdate m_animationUpdate; 176 CSSAnimationUpdate m_animationUpdate;
176 177
177 bool m_applyPropertyToRegularStyle; 178 bool m_applyPropertyToRegularStyle;
178 bool m_applyPropertyToVisitedLinkStyle; 179 bool m_applyPropertyToVisitedLinkStyle;
179 bool m_hasDirAutoAttribute; 180 bool m_hasDirAutoAttribute;
180 181
181 FontBuilder m_fontBuilder; 182 FontBuilder m_fontBuilder;
182 183
183 OwnPtr<CachedUAStyle> m_cachedUAStyle; 184 std::unique_ptr<CachedUAStyle> m_cachedUAStyle;
184 185
185 ElementStyleResources m_elementStyleResources; 186 ElementStyleResources m_elementStyleResources;
186 187
187 HeapHashMap<String, Member<StylePropertySet>> m_customPropertySetsForApplyAt Rule; 188 HeapHashMap<String, Member<StylePropertySet>> m_customPropertySetsForApplyAt Rule;
188 }; 189 };
189 190
190 } // namespace blink 191 } // namespace blink
191 192
192 #endif // StyleResolverState_h 193 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698