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

Side by Side Diff: sky/engine/core/dom/Element.cpp

Issue 869393002: Remove hasInlineTransform bit. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | sky/engine/core/rendering/style/RenderStyle.h » ('j') | 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 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 activeAnimations->cssAnimations().setPendingUpdate(nullptr); 889 activeAnimations->cssAnimations().setPendingUpdate(nullptr);
890 890
891 RefPtr<RenderStyle> style = document().styleResolver().styleForElement(this) ; 891 RefPtr<RenderStyle> style = document().styleResolver().styleForElement(this) ;
892 ASSERT(style); 892 ASSERT(style);
893 893
894 // styleForElement() might add active animations so we need to get it again. 894 // styleForElement() might add active animations so we need to get it again.
895 if (ActiveAnimations* activeAnimations = this->activeAnimations()) { 895 if (ActiveAnimations* activeAnimations = this->activeAnimations()) {
896 activeAnimations->cssAnimations().maybeApplyPendingUpdate(this); 896 activeAnimations->cssAnimations().maybeApplyPendingUpdate(this);
897 } 897 }
898 898
899 if (style->hasTransform()) {
900 if (const StylePropertySet* inlineStyle = this->inlineStyle())
901 style->setHasInlineTransform(inlineStyle->hasProperty(CSSPropertyTra nsform) || inlineStyle->hasProperty(CSSPropertyWebkitTransform));
902 }
903
904 document().didRecalculateStyleForElement(); 899 document().didRecalculateStyleForElement();
905 return style.release(); 900 return style.release();
906 } 901 }
907 902
908 void Element::recalcStyle(StyleRecalcChange change) 903 void Element::recalcStyle(StyleRecalcChange change)
909 { 904 {
910 ASSERT(document().inStyleRecalc()); 905 ASSERT(document().inStyleRecalc());
911 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc()); 906 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc());
912 907
913 if (isInsertionPoint()) 908 if (isInsertionPoint())
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
1762 return false; 1757 return false;
1763 if (treeScope().scopedStyleResolver().hasSelectorForId(idValue)) 1758 if (treeScope().scopedStyleResolver().hasSelectorForId(idValue))
1764 return true; 1759 return true;
1765 // Host rules could also have effects. 1760 // Host rules could also have effects.
1766 if (ShadowRoot* shadowRoot = this->shadowRoot()) 1761 if (ShadowRoot* shadowRoot = this->shadowRoot())
1767 return shadowRoot->scopedStyleResolver().hasSelectorForId(idValue); 1762 return shadowRoot->scopedStyleResolver().hasSelectorForId(idValue);
1768 return false; 1763 return false;
1769 } 1764 }
1770 1765
1771 } // namespace blink 1766 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698