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

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

Issue 712173002: Remove StyleInvalidator machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/dom/Node.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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 } 345 }
346 346
347 void StyleEngine::clearResolver() 347 void StyleEngine::clearResolver()
348 { 348 {
349 ASSERT(!document().inStyleRecalc()); 349 ASSERT(!document().inStyleRecalc());
350 ASSERT(isMaster() || !m_resolver); 350 ASSERT(isMaster() || !m_resolver);
351 351
352 for (ScopedStyleResolverSet::iterator it = m_scopedStyleResolvers.begin(); i t != m_scopedStyleResolvers.end(); ++it) 352 for (ScopedStyleResolverSet::iterator it = m_scopedStyleResolvers.begin(); i t != m_scopedStyleResolvers.end(); ++it)
353 const_cast<TreeScope&>((*it)->treeScope()).clearScopedStyleResolver(); 353 const_cast<TreeScope&>((*it)->treeScope()).clearScopedStyleResolver();
354 m_scopedStyleResolvers.clear(); 354 m_scopedStyleResolvers.clear();
355
356 if (m_resolver)
357 document().updateStyleInvalidationIfNeeded();
358 m_resolver.clear(); 355 m_resolver.clear();
359 } 356 }
360 357
361 void StyleEngine::clearMasterResolver() 358 void StyleEngine::clearMasterResolver()
362 { 359 {
363 if (Document* master = this->master()) 360 if (Document* master = this->master())
364 master->styleEngine()->clearResolver(); 361 master->styleEngine()->clearResolver();
365 } 362 }
366 363
367 unsigned StyleEngine::resolverAccessCount() const 364 unsigned StyleEngine::resolverAccessCount() const
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 visitor->trace(m_scopedStyleResolvers); 522 visitor->trace(m_scopedStyleResolvers);
526 visitor->trace(m_resolver); 523 visitor->trace(m_resolver);
527 visitor->trace(m_fontSelector); 524 visitor->trace(m_fontSelector);
528 visitor->trace(m_textToSheetCache); 525 visitor->trace(m_textToSheetCache);
529 visitor->trace(m_sheetToTextCache); 526 visitor->trace(m_sheetToTextCache);
530 #endif 527 #endif
531 CSSFontSelectorClient::trace(visitor); 528 CSSFontSelectorClient::trace(visitor);
532 } 529 }
533 530
534 } 531 }
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Node.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698