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

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

Issue 1853713002: Fixed ::slotted performance in pure v1 shadow documents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missing Member<> in HeapVector template Created 4 years, 8 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 | « third_party/WebKit/Source/core/dom/StyleEngine.h ('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 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 return; 720 return;
721 } 721 }
722 if (!m_styleResolverStats) 722 if (!m_styleResolverStats)
723 m_styleResolverStats = StyleResolverStats::create(); 723 m_styleResolverStats = StyleResolverStats::create();
724 else 724 else
725 m_styleResolverStats->reset(); 725 m_styleResolverStats->reset();
726 } 726 }
727 727
728 void StyleEngine::setShadowCascadeOrder(ShadowCascadeOrder order) 728 void StyleEngine::setShadowCascadeOrder(ShadowCascadeOrder order)
729 { 729 {
730 if (order <= m_shadowCascadeOrder) 730 ASSERT(order != ShadowCascadeOrder::ShadowCascadeNone);
731
732 if (order == m_shadowCascadeOrder)
731 return; 733 return;
732 734
735 if (order == ShadowCascadeOrder::ShadowCascadeV0)
736 m_mayContainV0Shadow = true;
737
733 // For V0 -> V1 upgrade, we need style recalculation for the whole document. 738 // For V0 -> V1 upgrade, we need style recalculation for the whole document.
734 if (m_shadowCascadeOrder == ShadowCascadeOrder::ShadowCascadeV0 && order == ShadowCascadeOrder::ShadowCascadeV1) 739 if (m_shadowCascadeOrder == ShadowCascadeOrder::ShadowCascadeV0 && order == ShadowCascadeOrder::ShadowCascadeV1)
735 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForT racing::create(StyleChangeReason::Shadow)); 740 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForT racing::create(StyleChangeReason::Shadow));
736 741
737 m_shadowCascadeOrder = order; 742 if (order > m_shadowCascadeOrder)
743 m_shadowCascadeOrder = order;
kochi 2016/04/04 04:48:09 Aha, good catch! createShadowRoot() could set this
738 } 744 }
739 745
740 void StyleEngine::setPreferredStylesheetSetNameIfNotSet(const String& name) 746 void StyleEngine::setPreferredStylesheetSetNameIfNotSet(const String& name)
741 { 747 {
742 if (!m_preferredStylesheetSetName.isEmpty()) 748 if (!m_preferredStylesheetSetName.isEmpty())
743 return; 749 return;
744 m_preferredStylesheetSetName = name; 750 m_preferredStylesheetSetName = name;
745 // TODO(rune@opera.com): Setting the selected set here is wrong if the set 751 // TODO(rune@opera.com): Setting the selected set here is wrong if the set
746 // has been previously set by through Document.selectedStylesheetSet. Our 752 // has been previously set by through Document.selectedStylesheetSet. Our
747 // current implementation ignores the effect of Document.selectedStylesheetS et 753 // current implementation ignores the effect of Document.selectedStylesheetS et
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 visitor->trace(m_dirtyTreeScopes); 796 visitor->trace(m_dirtyTreeScopes);
791 visitor->trace(m_activeTreeScopes); 797 visitor->trace(m_activeTreeScopes);
792 visitor->trace(m_fontSelector); 798 visitor->trace(m_fontSelector);
793 visitor->trace(m_textToSheetCache); 799 visitor->trace(m_textToSheetCache);
794 visitor->trace(m_sheetToTextCache); 800 visitor->trace(m_sheetToTextCache);
795 #endif 801 #endif
796 CSSFontSelectorClient::trace(visitor); 802 CSSFontSelectorClient::trace(visitor);
797 } 803 }
798 804
799 } // namespace blink 805 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698