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

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

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: 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
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 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 } 612 }
613 613
614 bool StyleEngine::shouldSkipInvalidationFor(const Element& element) const 614 bool StyleEngine::shouldSkipInvalidationFor(const Element& element) const
615 { 615 {
616 if (!resolver()) 616 if (!resolver())
617 return true; 617 return true;
618 if (!element.inActiveDocument()) 618 if (!element.inActiveDocument())
619 return true; 619 return true;
620 if (!element.parentNode()) 620 if (!element.parentNode())
621 return true; 621 return true;
622 return element.parentNode()->styleChangeType() >= SubtreeStyleChange; 622 return element.parentNode()->getStyleChangeType() >= SubtreeStyleChange;
623 } 623 }
624 624
625 void StyleEngine::classChangedForElement(const SpaceSplitString& changedClasses, Element& element) 625 void StyleEngine::classChangedForElement(const SpaceSplitString& changedClasses, Element& element)
626 { 626 {
627 if (shouldSkipInvalidationFor(element)) 627 if (shouldSkipInvalidationFor(element))
628 return; 628 return;
629 InvalidationLists invalidationLists; 629 InvalidationLists invalidationLists;
630 unsigned changedSize = changedClasses.size(); 630 unsigned changedSize = changedClasses.size();
631 RuleFeatureSet& ruleFeatureSet = ensureResolver().ensureUpdatedRuleFeatureSe t(); 631 RuleFeatureSet& ruleFeatureSet = ensureResolver().ensureUpdatedRuleFeatureSe t();
632 for (unsigned i = 0; i < changedSize; ++i) 632 for (unsigned i = 0; i < changedSize; ++i)
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 visitor->trace(m_dirtyTreeScopes); 735 visitor->trace(m_dirtyTreeScopes);
736 visitor->trace(m_activeTreeScopes); 736 visitor->trace(m_activeTreeScopes);
737 visitor->trace(m_fontSelector); 737 visitor->trace(m_fontSelector);
738 visitor->trace(m_textToSheetCache); 738 visitor->trace(m_textToSheetCache);
739 visitor->trace(m_sheetToTextCache); 739 visitor->trace(m_sheetToTextCache);
740 #endif 740 #endif
741 CSSFontSelectorClient::trace(visitor); 741 CSSFontSelectorClient::trace(visitor);
742 } 742 }
743 743
744 } // namespace blink 744 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698