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

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

Issue 844873002: Simplify the style sharing list code. (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
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.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 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 documentElement->recalcStyle(change); 1099 documentElement->recalcStyle(change);
1100 } 1100 }
1101 1101
1102 ensureStyleResolver().printStats(); 1102 ensureStyleResolver().printStats();
1103 1103
1104 view()->recalcOverflowAfterStyleChange(); 1104 view()->recalcOverflowAfterStyleChange();
1105 1105
1106 clearChildNeedsStyleRecalc(); 1106 clearChildNeedsStyleRecalc();
1107 1107
1108 if (m_styleEngine->hasResolver()) { 1108 if (m_styleEngine->hasResolver()) {
1109 // Pseudo element removal and similar may only work with these flags sti ll set. Reset them after the style recalc.
1110 StyleResolver& resolver = m_styleEngine->ensureResolver(); 1109 StyleResolver& resolver = m_styleEngine->ensureResolver();
1111 resolver.clearStyleSharingList(); 1110 resolver.clearStyleSharingList();
1112 } 1111 }
1113 1112
1114 ASSERT(!needsStyleRecalc()); 1113 ASSERT(!needsStyleRecalc());
1115 ASSERT(!childNeedsStyleRecalc()); 1114 ASSERT(!childNeedsStyleRecalc());
1116 ASSERT(inStyleRecalc()); 1115 ASSERT(inStyleRecalc());
1117 m_lifecycle.advanceTo(DocumentLifecycle::StyleClean); 1116 m_lifecycle.advanceTo(DocumentLifecycle::StyleClean);
1118 } 1117 }
1119 1118
(...skipping 1592 matching lines...) Expand 10 before | Expand all | Expand 10 after
2712 using namespace blink; 2711 using namespace blink;
2713 void showLiveDocumentInstances() 2712 void showLiveDocumentInstances()
2714 { 2713 {
2715 WeakDocumentSet& set = liveDocumentSet(); 2714 WeakDocumentSet& set = liveDocumentSet();
2716 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 2715 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
2717 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 2716 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
2718 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 2717 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
2719 } 2718 }
2720 } 2719 }
2721 #endif 2720 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698