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

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

Issue 1803933002: Use correct cascading order for Shadow DOM v1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix enum Created 4 years, 9 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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 if (!enabled) { 718 if (!enabled) {
719 m_styleResolverStats = nullptr; 719 m_styleResolverStats = nullptr;
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)
729 {
730 if (order <= m_shadowCascadeOrder)
731 return;
732
733 // For V0 -> V1 upgrade, we need style recalculation for the whole document.
734 if (m_shadowCascadeOrder == ShadowCascadeOrder::ShadowCascadeV0 && order == ShadowCascadeOrder::ShadowCascadeV1)
735 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForT racing::create(StyleChangeReason::Shadow));
736
737 m_shadowCascadeOrder = order;
738 }
739
728 void StyleEngine::setPreferredStylesheetSetNameIfNotSet(const String& name) 740 void StyleEngine::setPreferredStylesheetSetNameIfNotSet(const String& name)
729 { 741 {
730 if (!m_preferredStylesheetSetName.isEmpty()) 742 if (!m_preferredStylesheetSetName.isEmpty())
731 return; 743 return;
732 m_preferredStylesheetSetName = name; 744 m_preferredStylesheetSetName = name;
733 // TODO(rune@opera.com): Setting the selected set here is wrong if the set 745 // TODO(rune@opera.com): Setting the selected set here is wrong if the set
734 // has been previously set by through Document.selectedStylesheetSet. Our 746 // has been previously set by through Document.selectedStylesheetSet. Our
735 // current implementation ignores the effect of Document.selectedStylesheetS et 747 // current implementation ignores the effect of Document.selectedStylesheetS et
736 // and either only collects persistent style, or additionally preferred 748 // and either only collects persistent style, or additionally preferred
737 // style when present. We are currently not marking the document scope dirty 749 // style when present. We are currently not marking the document scope dirty
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 visitor->trace(m_dirtyTreeScopes); 790 visitor->trace(m_dirtyTreeScopes);
779 visitor->trace(m_activeTreeScopes); 791 visitor->trace(m_activeTreeScopes);
780 visitor->trace(m_fontSelector); 792 visitor->trace(m_fontSelector);
781 visitor->trace(m_textToSheetCache); 793 visitor->trace(m_textToSheetCache);
782 visitor->trace(m_sheetToTextCache); 794 visitor->trace(m_sheetToTextCache);
783 #endif 795 #endif
784 CSSFontSelectorClient::trace(visitor); 796 CSSFontSelectorClient::trace(visitor);
785 } 797 }
786 798
787 } // namespace blink 799 } // 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