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

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

Issue 468503003: Remove FIXME in StyleResolver::styleForElement (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add test Created 6 years, 4 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 | « LayoutTests/fast/css/webkit-text-display-none-expected.txt ('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) 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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 state.style()->setOriginalDisplay(state.style()->display()); 645 state.style()->setOriginalDisplay(state.style()->display());
646 646
647 adjustRenderStyle(state, element); 647 adjustRenderStyle(state, element);
648 648
649 // FIXME: The CSSWG wants to specify that the effects of animations are appl ied before 649 // FIXME: The CSSWG wants to specify that the effects of animations are appl ied before
650 // important rules, but this currently happens here as we require adjustment to have happened 650 // important rules, but this currently happens here as we require adjustment to have happened
651 // before deciding which properties to transition. 651 // before deciding which properties to transition.
652 if (applyAnimatedProperties(state, element)) 652 if (applyAnimatedProperties(state, element))
653 adjustRenderStyle(state, element); 653 adjustRenderStyle(state, element);
654 654
655 // FIXME: Shouldn't this be on RenderBody::styleDidChange?
656 if (isHTMLBodyElement(*element)) 655 if (isHTMLBodyElement(*element))
657 document().textLinkColors().setTextColor(state.style()->color()); 656 document().textLinkColors().setTextColor(state.style()->color());
658 657
659 setAnimationUpdateIfNeeded(state, *element); 658 setAnimationUpdateIfNeeded(state, *element);
660 659
661 if (state.style()->hasViewportUnits()) 660 if (state.style()->hasViewportUnits())
662 document().setHasViewportUnits(); 661 document().setHasViewportUnits();
663 662
664 // Now return the style. 663 // Now return the style.
665 return state.takeStyle(); 664 return state.takeStyle();
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
1604 visitor->trace(m_uncommonAttributeRuleSet); 1603 visitor->trace(m_uncommonAttributeRuleSet);
1605 visitor->trace(m_watchedSelectorsRules); 1604 visitor->trace(m_watchedSelectorsRules);
1606 visitor->trace(m_treeBoundaryCrossingRules); 1605 visitor->trace(m_treeBoundaryCrossingRules);
1607 visitor->trace(m_styleSharingLists); 1606 visitor->trace(m_styleSharingLists);
1608 visitor->trace(m_pendingStyleSheets); 1607 visitor->trace(m_pendingStyleSheets);
1609 visitor->trace(m_document); 1608 visitor->trace(m_document);
1610 #endif 1609 #endif
1611 } 1610 }
1612 1611
1613 } // namespace blink 1612 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/webkit-text-display-none-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698