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

Side by Side Diff: third_party/WebKit/Source/core/dom/StyleEngine.cpp

Issue 2622673003: Try to do less work clearing the font-cache in StyleEngine::didDetach. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, 2011, 2012 Apple Inc. All 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
7 * rights reserved. 7 * rights reserved.
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 } 444 }
445 445
446 void StyleEngine::didDetach() { 446 void StyleEngine::didDetach() {
447 clearResolvers(); 447 clearResolvers();
448 m_globalRuleSet.dispose(); 448 m_globalRuleSet.dispose();
449 m_treeBoundaryCrossingScopes.clear(); 449 m_treeBoundaryCrossingScopes.clear();
450 m_dirtyTreeScopes.clear(); 450 m_dirtyTreeScopes.clear();
451 m_activeTreeScopes.clear(); 451 m_activeTreeScopes.clear();
452 m_viewportResolver = nullptr; 452 m_viewportResolver = nullptr;
453 m_mediaQueryEvaluator = nullptr; 453 m_mediaQueryEvaluator = nullptr;
454 clearFontCache(); 454 if (m_fontSelector)
455 m_fontSelector->fontFaceCache()->clearAll();
456 m_fontSelector = nullptr;
455 } 457 }
456 458
457 void StyleEngine::clearFontCache() { 459 void StyleEngine::clearFontCache() {
458 if (m_fontSelector) 460 if (m_fontSelector)
459 m_fontSelector->fontFaceCache()->clearCSSConnected(); 461 m_fontSelector->fontFaceCache()->clearCSSConnected();
460 if (m_resolver) 462 if (m_resolver)
461 m_resolver->invalidateMatchedPropertiesCache(); 463 m_resolver->invalidateMatchedPropertiesCache();
462 } 464 }
463 465
464 void StyleEngine::updateGenericFontFamilySettings() { 466 void StyleEngine::updateGenericFontFamilySettings() {
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 } 1137 }
1136 1138
1137 DEFINE_TRACE_WRAPPERS(StyleEngine) { 1139 DEFINE_TRACE_WRAPPERS(StyleEngine) {
1138 for (auto sheet : m_injectedAuthorStyleSheets) { 1140 for (auto sheet : m_injectedAuthorStyleSheets) {
1139 visitor->traceWrappers(sheet); 1141 visitor->traceWrappers(sheet);
1140 } 1142 }
1141 visitor->traceWrappers(m_documentStyleSheetCollection); 1143 visitor->traceWrappers(m_documentStyleSheetCollection);
1142 } 1144 }
1143 1145
1144 } // namespace blink 1146 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698