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

Side by Side Diff: third_party/WebKit/Source/core/dom/StyleEngine.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 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 25 matching lines...) Expand all
36 #include "core/dom/Document.h" 36 #include "core/dom/Document.h"
37 #include "core/dom/DocumentOrderedList.h" 37 #include "core/dom/DocumentOrderedList.h"
38 #include "core/dom/DocumentStyleSheetCollection.h" 38 #include "core/dom/DocumentStyleSheetCollection.h"
39 #include "core/dom/StyleEngineContext.h" 39 #include "core/dom/StyleEngineContext.h"
40 #include "platform/heap/Handle.h" 40 #include "platform/heap/Handle.h"
41 #include "wtf/Allocator.h" 41 #include "wtf/Allocator.h"
42 #include "wtf/ListHashSet.h" 42 #include "wtf/ListHashSet.h"
43 #include "wtf/TemporaryChange.h" 43 #include "wtf/TemporaryChange.h"
44 #include "wtf/Vector.h" 44 #include "wtf/Vector.h"
45 #include "wtf/text/WTFString.h" 45 #include "wtf/text/WTFString.h"
46 #include <memory>
46 47
47 namespace blink { 48 namespace blink {
48 49
49 class CSSFontSelector; 50 class CSSFontSelector;
50 class CSSStyleSheet; 51 class CSSStyleSheet;
51 class Node; 52 class Node;
52 class RuleFeatureSet; 53 class RuleFeatureSet;
53 class ShadowTreeStyleSheetCollection; 54 class ShadowTreeStyleSheetCollection;
54 class StyleRuleFontFace; 55 class StyleRuleFontFace;
55 class StyleSheet; 56 class StyleSheet;
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 bool m_didCalculateResolver = false; 255 bool m_didCalculateResolver = false;
255 256
256 Member<StyleResolver> m_resolver; 257 Member<StyleResolver> m_resolver;
257 StyleInvalidator m_styleInvalidator; 258 StyleInvalidator m_styleInvalidator;
258 259
259 Member<CSSFontSelector> m_fontSelector; 260 Member<CSSFontSelector> m_fontSelector;
260 261
261 HeapHashMap<AtomicString, Member<StyleSheetContents>> m_textToSheetCache; 262 HeapHashMap<AtomicString, Member<StyleSheetContents>> m_textToSheetCache;
262 HeapHashMap<Member<StyleSheetContents>, AtomicString> m_sheetToTextCache; 263 HeapHashMap<Member<StyleSheetContents>, AtomicString> m_sheetToTextCache;
263 264
264 OwnPtr<StyleResolverStats> m_styleResolverStats; 265 std::unique_ptr<StyleResolverStats> m_styleResolverStats;
265 unsigned m_styleForElementCount = 0; 266 unsigned m_styleForElementCount = 0;
266 267
267 friend class StyleEngineTest; 268 friend class StyleEngineTest;
268 }; 269 };
269 270
270 } // namespace blink 271 } // namespace blink
271 272
272 #endif 273 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleElementTest.cpp ('k') | third_party/WebKit/Source/core/dom/StyleEngineTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698