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

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

Issue 1131793008: Forced style invalidation when clearing resolver no longer needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed no longer valid styleResolver() assert. Created 5 years, 7 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 | « Source/core/dom/Document.cpp ('k') | 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 r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 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) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 // StyleEngine::shadowRootRemovedFromDocument removes not-in-document 487 // StyleEngine::shadowRootRemovedFromDocument removes not-in-document
488 // treescopes from activeTreeScopes. StyleEngine::didRemoveShadowRoot 488 // treescopes from activeTreeScopes. StyleEngine::didRemoveShadowRoot
489 // removes treescopes which are being destroyed from activeTreeScopes. 489 // removes treescopes which are being destroyed from activeTreeScopes.
490 // So we need to clearScopedStyleResolver for treescopes which have been 490 // So we need to clearScopedStyleResolver for treescopes which have been
491 // just removed from document. If document is destroyed before invoking 491 // just removed from document. If document is destroyed before invoking
492 // updateActiveStyleSheets, the treescope has a scopedStyleResolver which 492 // updateActiveStyleSheets, the treescope has a scopedStyleResolver which
493 // has destroyed StyleSheetContents. 493 // has destroyed StyleSheetContents.
494 for (UnorderedTreeScopeSet::iterator it = m_activeTreeScopes.beginUnordered( ); it != m_activeTreeScopes.endUnordered(); ++it) 494 for (UnorderedTreeScopeSet::iterator it = m_activeTreeScopes.beginUnordered( ); it != m_activeTreeScopes.endUnordered(); ++it)
495 (*it)->clearScopedStyleResolver(); 495 (*it)->clearScopedStyleResolver();
496 496
497 if (m_resolver)
498 document().updateStyleInvalidationIfNeeded();
499 m_resolver.clear(); 497 m_resolver.clear();
500 } 498 }
501 499
502 void StyleEngine::clearMasterResolver() 500 void StyleEngine::clearMasterResolver()
503 { 501 {
504 if (Document* master = this->master()) 502 if (Document* master = this->master())
505 master->styleEngine().clearResolver(); 503 master->styleEngine().clearResolver();
506 } 504 }
507 505
508 unsigned StyleEngine::resolverAccessCount() const 506 unsigned StyleEngine::resolverAccessCount() const
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 visitor->trace(m_dirtyTreeScopes); 792 visitor->trace(m_dirtyTreeScopes);
795 visitor->trace(m_activeTreeScopes); 793 visitor->trace(m_activeTreeScopes);
796 visitor->trace(m_fontSelector); 794 visitor->trace(m_fontSelector);
797 visitor->trace(m_textToSheetCache); 795 visitor->trace(m_textToSheetCache);
798 visitor->trace(m_sheetToTextCache); 796 visitor->trace(m_sheetToTextCache);
799 #endif 797 #endif
800 CSSFontSelectorClient::trace(visitor); 798 CSSFontSelectorClient::trace(visitor);
801 } 799 }
802 800
803 } 801 }
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698