Source/core/dom/StyleEngine.h - Issue 87503003: Moving fontSelector from StyleResolver to StyleEngine.

Side by Side Diff: Source/core/dom/StyleEngine.h

Issue 87503003: Moving fontSelector from StyleResolver to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Reverted hasAnyFontFaceRule Created 7 years 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

OLD	NEW
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 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
154 createResolver();	154 createResolver();

155 } else if (m_resolver->hasPendingAuthorStyleSheets()) {	155 } else if (m_resolver->hasPendingAuthorStyleSheets()) {

156 m_resolver->appendPendingAuthorStyleSheets();	156 m_resolver->appendPendingAuthorStyleSheets();

157 }	157 }

158 return m_resolver.get();	158 return m_resolver.get();

159 }	159 }

160	160

161 bool hasResolver() const { return m_resolver.get(); }	161 bool hasResolver() const { return m_resolver.get(); }

162 void clearResolver();	162 void clearResolver();

163	163

164 CSSFontSelector* fontSelector();	164 CSSFontSelector* fontSelector() { return m_fontSelector.get(); }

	165 void resetFontSelector();

	166

165 void didAttach();	167 void didAttach();

166 void didDetach();	168 void didDetach();

167 bool shouldClearResolver() const;	169 bool shouldClearResolver() const;

168 StyleResolverChange resolverChanged(StyleResolverUpdateMode);	170 StyleResolverChange resolverChanged(StyleResolverUpdateMode);

169 unsigned resolverAccessCount() const;	171 unsigned resolverAccessCount() const;

170	172

171 private:	173 private:

172 StyleEngine(Document&);	174 StyleEngine(Document&);

173	175

174 StyleSheetCollection* ensureStyleSheetCollectionFor(TreeScope&);	176 StyleSheetCollection* ensureStyleSheetCollectionFor(TreeScope&);

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
211 bool m_usesFirstLineRules;	213 bool m_usesFirstLineRules;

212 bool m_usesFirstLetterRules;	214 bool m_usesFirstLetterRules;

213 bool m_usesRemUnits;	215 bool m_usesRemUnits;

214 unsigned m_maxDirectAdjacentSelectors;	216 unsigned m_maxDirectAdjacentSelectors;

215	217

216 bool m_ignorePendingStylesheets;	218 bool m_ignorePendingStylesheets;

217 bool m_didCalculateResolver;	219 bool m_didCalculateResolver;

218 unsigned m_lastResolverAccessCount;	220 unsigned m_lastResolverAccessCount;

219 Timer<StyleEngine> m_resolverThrowawayTimer;	221 Timer<StyleEngine> m_resolverThrowawayTimer;

220 OwnPtr<StyleResolver> m_resolver;	222 OwnPtr<StyleResolver> m_resolver;

	223

	224 RefPtr<CSSFontSelector> m_fontSelector;

221 };	225 };

222	226

223 }	227 }

224	228

225 #endif	229 #endif

OLD	NEW

« Source/core/dom/Document.cpp ('K') | « Source/core/dom/DocumentStyleSheetCollection.cpp ('k') | Source/core/dom/StyleEngine.cpp » ('j') | Source/core/dom/StyleEngine.cpp » ('J')