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

Side by Side Diff: sky/engine/core/dom/StyleEngine.h

Issue 851873002: Move @font-face logic from ScopedStyleResolver to StyleEngine. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // CSSFontSelectorClient implementation. 75 // CSSFontSelectorClient implementation.
76 virtual void fontsNeedUpdate(CSSFontSelector*) override; 76 virtual void fontsNeedUpdate(CSSFontSelector*) override;
77 77
78 private: 78 private:
79 explicit StyleEngine(Document&); 79 explicit StyleEngine(Document&);
80 80
81 // TODO(esprehn): Need to call this after @font-face rules load. 81 // TODO(esprehn): Need to call this after @font-face rules load.
82 void clearFontCache(); 82 void clearFontCache();
83 83
84 void updateActiveStyleSheets(); 84 void updateActiveStyleSheets();
85 void updateDocumentFonts();
85 86
86 RawPtr<Document> m_document; 87 RawPtr<Document> m_document;
87 88
88 typedef ListHashSet<TreeScope*, 16> TreeScopeSet; 89 typedef ListHashSet<TreeScope*, 16> TreeScopeSet;
89 TreeScopeSet m_activeTreeScopes; 90 TreeScopeSet m_activeTreeScopes;
90 91
91 OwnPtr<StyleResolver> m_resolver; 92 OwnPtr<StyleResolver> m_resolver;
92 93
93 RefPtr<CSSFontSelector> m_fontSelector; 94 RefPtr<CSSFontSelector> m_fontSelector;
94 95
95 HashMap<AtomicString, StyleSheetContents*> m_textToSheetCache; 96 HashMap<AtomicString, StyleSheetContents*> m_textToSheetCache;
96 HashMap<StyleSheetContents*, AtomicString> m_sheetToTextCache; 97 HashMap<StyleSheetContents*, AtomicString> m_sheetToTextCache;
97 }; 98 };
98 99
99 } 100 }
100 101
101 #endif // SKY_ENGINE_CORE_DOM_STYLEENGINE_H_ 102 #endif // SKY_ENGINE_CORE_DOM_STYLEENGINE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/ScopedStyleResolver.cpp ('k') | sky/engine/core/dom/StyleEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698