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

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

Issue 2677843002: Change ComputedStyle::setUnique to take bool parameter. (Closed)
Patch Set: Created 3 years, 10 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. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 729
730 if (element->computedStyle() && 730 if (element->computedStyle() &&
731 element->computedStyle()->textAutosizingMultiplier() != 731 element->computedStyle()->textAutosizingMultiplier() !=
732 state.style()->textAutosizingMultiplier()) { 732 state.style()->textAutosizingMultiplier()) {
733 // Preserve the text autosizing multiplier on style recalc. Autosizer will 733 // Preserve the text autosizing multiplier on style recalc. Autosizer will
734 // update it during layout if needed. 734 // update it during layout if needed.
735 // NOTE: this must occur before applyMatchedProperties for correct 735 // NOTE: this must occur before applyMatchedProperties for correct
736 // computation of font-relative lengths. 736 // computation of font-relative lengths.
737 state.style()->setTextAutosizingMultiplier( 737 state.style()->setTextAutosizingMultiplier(
738 element->computedStyle()->textAutosizingMultiplier()); 738 element->computedStyle()->textAutosizingMultiplier());
739 state.style()->setUnique(); 739 state.style()->setUnique(true);
740 } 740 }
741 741
742 if (state.hasDirAutoAttribute()) 742 if (state.hasDirAutoAttribute())
743 state.style()->setSelfOrAncestorHasDirAutoAttribute(true); 743 state.style()->setSelfOrAncestorHasDirAutoAttribute(true);
744 744
745 applyMatchedPropertiesAndCustomPropertyAnimations( 745 applyMatchedPropertiesAndCustomPropertyAnimations(
746 state, collector.matchedResult(), element); 746 state, collector.matchedResult(), element);
747 applyCallbackSelectors(state); 747 applyCallbackSelectors(state);
748 748
749 // Cache our original display. 749 // Cache our original display.
(...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 1933
1934 DEFINE_TRACE(StyleResolver) { 1934 DEFINE_TRACE(StyleResolver) {
1935 visitor->trace(m_matchedPropertiesCache); 1935 visitor->trace(m_matchedPropertiesCache);
1936 visitor->trace(m_selectorFilter); 1936 visitor->trace(m_selectorFilter);
1937 visitor->trace(m_styleSharingLists); 1937 visitor->trace(m_styleSharingLists);
1938 visitor->trace(m_document); 1938 visitor->trace(m_document);
1939 visitor->trace(m_tracker); 1939 visitor->trace(m_tracker);
1940 } 1940 }
1941 1941
1942 } // namespace blink 1942 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698