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

Side by Side Diff: Source/core/dom/ContainerNode.cpp

Issue 289163003: Fix build with gcc 4.8 and C++11 support enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/html/HTMLFormControlElement.cpp » ('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 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 if (styleChangeType() < SubtreeStyleChange) { 832 if (styleChangeType() < SubtreeStyleChange) {
833 if (renderStyle()->affectedByFocus() && renderStyle()->hasPseudoStyle(FI RST_LETTER)) 833 if (renderStyle()->affectedByFocus() && renderStyle()->hasPseudoStyle(FI RST_LETTER))
834 setNeedsStyleRecalc(SubtreeStyleChange); 834 setNeedsStyleRecalc(SubtreeStyleChange);
835 else if (isElementNode() && toElement(this)->childrenAffectedByFocus()) 835 else if (isElementNode() && toElement(this)->childrenAffectedByFocus())
836 document().ensureStyleResolver().ensureUpdatedRuleFeatureSet().sched uleStyleInvalidationForPseudoChange(CSSSelector::PseudoFocus, *toElement(this)); 836 document().ensureStyleResolver().ensureUpdatedRuleFeatureSet().sched uleStyleInvalidationForPseudoChange(CSSSelector::PseudoFocus, *toElement(this));
837 else if (renderStyle()->affectedByFocus()) 837 else if (renderStyle()->affectedByFocus())
838 setNeedsStyleRecalc(LocalStyleChange); 838 setNeedsStyleRecalc(LocalStyleChange);
839 } 839 }
840 840
841 if (renderer() && renderer()->style()->hasAppearance()) 841 if (renderer() && renderer()->style()->hasAppearance())
842 RenderTheme::theme().stateChanged(renderer(), FocusState); 842 RenderTheme::theme().stateChanged(renderer(), FocusControlState);
843 } 843 }
844 844
845 void ContainerNode::setFocus(bool received) 845 void ContainerNode::setFocus(bool received)
846 { 846 {
847 if (focused() == received) 847 if (focused() == received)
848 return; 848 return;
849 849
850 Node::setFocus(received); 850 Node::setFocus(received);
851 851
852 focusStateChanged(); 852 focusStateChanged();
(...skipping 20 matching lines...) Expand all
873 if (styleChangeType() < SubtreeStyleChange) { 873 if (styleChangeType() < SubtreeStyleChange) {
874 if (renderStyle()->affectedByActive() && renderStyle()->hasPseudoSty le(FIRST_LETTER)) 874 if (renderStyle()->affectedByActive() && renderStyle()->hasPseudoSty le(FIRST_LETTER))
875 setNeedsStyleRecalc(SubtreeStyleChange); 875 setNeedsStyleRecalc(SubtreeStyleChange);
876 else if (isElementNode() && toElement(this)->childrenAffectedByActiv e()) 876 else if (isElementNode() && toElement(this)->childrenAffectedByActiv e())
877 document().ensureStyleResolver().ensureUpdatedRuleFeatureSet().s cheduleStyleInvalidationForPseudoChange(CSSSelector::PseudoActive, *toElement(th is)); 877 document().ensureStyleResolver().ensureUpdatedRuleFeatureSet().s cheduleStyleInvalidationForPseudoChange(CSSSelector::PseudoActive, *toElement(th is));
878 else if (renderStyle()->affectedByActive()) 878 else if (renderStyle()->affectedByActive())
879 setNeedsStyleRecalc(LocalStyleChange); 879 setNeedsStyleRecalc(LocalStyleChange);
880 } 880 }
881 881
882 if (renderStyle()->hasAppearance()) 882 if (renderStyle()->hasAppearance())
883 RenderTheme::theme().stateChanged(renderer(), PressedState); 883 RenderTheme::theme().stateChanged(renderer(), PressedControlState);
884 } 884 }
885 } 885 }
886 886
887 void ContainerNode::setHovered(bool over) 887 void ContainerNode::setHovered(bool over)
888 { 888 {
889 if (over == hovered()) 889 if (over == hovered())
890 return; 890 return;
891 891
892 Node::setHovered(over); 892 Node::setHovered(over);
893 893
(...skipping 11 matching lines...) Expand all
905 if (styleChangeType() < SubtreeStyleChange) { 905 if (styleChangeType() < SubtreeStyleChange) {
906 if (renderStyle()->affectedByHover() && renderStyle()->hasPseudoStyle(FI RST_LETTER)) 906 if (renderStyle()->affectedByHover() && renderStyle()->hasPseudoStyle(FI RST_LETTER))
907 setNeedsStyleRecalc(SubtreeStyleChange); 907 setNeedsStyleRecalc(SubtreeStyleChange);
908 else if (isElementNode() && toElement(this)->childrenAffectedByHover()) 908 else if (isElementNode() && toElement(this)->childrenAffectedByHover())
909 document().ensureStyleResolver().ensureUpdatedRuleFeatureSet().sched uleStyleInvalidationForPseudoChange(CSSSelector::PseudoHover, *toElement(this)); 909 document().ensureStyleResolver().ensureUpdatedRuleFeatureSet().sched uleStyleInvalidationForPseudoChange(CSSSelector::PseudoHover, *toElement(this));
910 else if (renderStyle()->affectedByHover()) 910 else if (renderStyle()->affectedByHover())
911 setNeedsStyleRecalc(LocalStyleChange); 911 setNeedsStyleRecalc(LocalStyleChange);
912 } 912 }
913 913
914 if (renderer()->style()->hasAppearance()) 914 if (renderer()->style()->hasAppearance())
915 RenderTheme::theme().stateChanged(renderer(), HoverState); 915 RenderTheme::theme().stateChanged(renderer(), HoverControlState);
916 } 916 }
917 917
918 PassRefPtr<HTMLCollection> ContainerNode::children() 918 PassRefPtr<HTMLCollection> ContainerNode::children()
919 { 919 {
920 return ensureRareData().ensureNodeLists().addCache<HTMLCollection>(*this, No deChildren); 920 return ensureRareData().ensureNodeLists().addCache<HTMLCollection>(*this, No deChildren);
921 } 921 }
922 922
923 unsigned ContainerNode::countChildren() const 923 unsigned ContainerNode::countChildren() const
924 { 924 {
925 unsigned count = 0; 925 unsigned count = 0;
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 return true; 1218 return true;
1219 1219
1220 if (node->isElementNode() && toElement(node)->shadow()) 1220 if (node->isElementNode() && toElement(node)->shadow())
1221 return true; 1221 return true;
1222 1222
1223 return false; 1223 return false;
1224 } 1224 }
1225 #endif 1225 #endif
1226 1226
1227 } // namespace WebCore 1227 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLFormControlElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698