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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2187493004: Add a generated ComputedStyleBase class that ComputedStyle extends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_make_visibility_enum_class_rebase
Patch Set: Rebase onto fast path patches Created 4 years, 3 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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 ElementAnimations* elementAnimations = element->elementAnimations(); 747 ElementAnimations* elementAnimations = element->elementAnimations();
748 const ComputedStyle* baseComputedStyle = elementAnimations ? elementAnimatio ns->baseComputedStyle() : nullptr; 748 const ComputedStyle* baseComputedStyle = elementAnimations ? elementAnimatio ns->baseComputedStyle() : nullptr;
749 749
750 if (baseComputedStyle) { 750 if (baseComputedStyle) {
751 state.setStyle(ComputedStyle::clone(*baseComputedStyle)); 751 state.setStyle(ComputedStyle::clone(*baseComputedStyle));
752 if (!state.parentStyle()) 752 if (!state.parentStyle())
753 state.setParentStyle(initialStyleForElement()); 753 state.setParentStyle(initialStyleForElement());
754 } else { 754 } else {
755 if (state.parentStyle()) { 755 if (state.parentStyle()) {
756 RefPtr<ComputedStyle> style = ComputedStyle::create(); 756 RefPtr<ComputedStyle> style = ComputedStyle::create();
757 style->inheritFrom(*state.parentStyle(), isAtShadowBoundary(element) ? ComputedStyle::AtShadowBoundary : ComputedStyle::NotAtShadowBoundary); 757 style->inheritFrom(*state.parentStyle(), isAtShadowBoundary(element) ? AtShadowBoundary : NotAtShadowBoundary);
758 state.setStyle(style.release()); 758 state.setStyle(style.release());
759 } else { 759 } else {
760 state.setStyle(initialStyleForElement()); 760 state.setStyle(initialStyleForElement());
761 state.setParentStyle(ComputedStyle::clone(*state.style())); 761 state.setParentStyle(ComputedStyle::clone(*state.style()));
762 } 762 }
763 } 763 }
764 764
765 // contenteditable attribute (implemented by -webkit-user-modify) should 765 // contenteditable attribute (implemented by -webkit-user-modify) should
766 // be propagated from shadow host to distributed node. 766 // be propagated from shadow host to distributed node.
767 if (state.distributedToInsertionPoint()) { 767 if (state.distributedToInsertionPoint()) {
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 visitor->trace(m_siblingRuleSet); 1744 visitor->trace(m_siblingRuleSet);
1745 visitor->trace(m_uncommonAttributeRuleSet); 1745 visitor->trace(m_uncommonAttributeRuleSet);
1746 visitor->trace(m_watchedSelectorsRules); 1746 visitor->trace(m_watchedSelectorsRules);
1747 visitor->trace(m_treeBoundaryCrossingScopes); 1747 visitor->trace(m_treeBoundaryCrossingScopes);
1748 visitor->trace(m_styleSharingLists); 1748 visitor->trace(m_styleSharingLists);
1749 visitor->trace(m_pendingStyleSheets); 1749 visitor->trace(m_pendingStyleSheets);
1750 visitor->trace(m_document); 1750 visitor->trace(m_document);
1751 } 1751 }
1752 1752
1753 } // namespace blink 1753 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698