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

Side by Side Diff: Source/core/html/HTMLInputElement.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 | « Source/core/html/HTMLFormControlElement.cpp ('k') | Source/core/html/HTMLOptionElement.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, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org) 7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 9 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
10 * Copyright (C) 2012 Samsung Electronics. All rights reserved. 10 * Copyright (C) 2012 Samsung Electronics. All rights reserved.
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 return; 838 return;
839 839
840 RefPtrWillBeRawPtr<HTMLInputElement> protector(this); 840 RefPtrWillBeRawPtr<HTMLInputElement> protector(this);
841 m_reflectsCheckedAttribute = false; 841 m_reflectsCheckedAttribute = false;
842 m_isChecked = nowChecked; 842 m_isChecked = nowChecked;
843 setNeedsStyleRecalc(SubtreeStyleChange); 843 setNeedsStyleRecalc(SubtreeStyleChange);
844 844
845 if (RadioButtonGroupScope* scope = radioButtonGroupScope()) 845 if (RadioButtonGroupScope* scope = radioButtonGroupScope())
846 scope->updateCheckedState(this); 846 scope->updateCheckedState(this);
847 if (renderer() && renderer()->style()->hasAppearance()) 847 if (renderer() && renderer()->style()->hasAppearance())
848 RenderTheme::theme().stateChanged(renderer(), CheckedState); 848 RenderTheme::theme().stateChanged(renderer(), CheckedControlState);
849 849
850 setNeedsValidityCheck(); 850 setNeedsValidityCheck();
851 851
852 // Ideally we'd do this from the render tree (matching 852 // Ideally we'd do this from the render tree (matching
853 // RenderTextView), but it's not possible to do it at the moment 853 // RenderTextView), but it's not possible to do it at the moment
854 // because of the way the code is structured. 854 // because of the way the code is structured.
855 if (renderer()) { 855 if (renderer()) {
856 if (AXObjectCache* cache = renderer()->document().existingAXObjectCache( )) 856 if (AXObjectCache* cache = renderer()->document().existingAXObjectCache( ))
857 cache->checkedStateChanged(this); 857 cache->checkedStateChanged(this);
858 } 858 }
(...skipping 16 matching lines...) Expand all
875 void HTMLInputElement::setIndeterminate(bool newValue) 875 void HTMLInputElement::setIndeterminate(bool newValue)
876 { 876 {
877 if (indeterminate() == newValue) 877 if (indeterminate() == newValue)
878 return; 878 return;
879 879
880 m_isIndeterminate = newValue; 880 m_isIndeterminate = newValue;
881 881
882 didAffectSelector(AffectedSelectorIndeterminate); 882 didAffectSelector(AffectedSelectorIndeterminate);
883 883
884 if (renderer() && renderer()->style()->hasAppearance()) 884 if (renderer() && renderer()->style()->hasAppearance())
885 RenderTheme::theme().stateChanged(renderer(), CheckedState); 885 RenderTheme::theme().stateChanged(renderer(), CheckedControlState);
886 } 886 }
887 887
888 int HTMLInputElement::size() const 888 int HTMLInputElement::size() const
889 { 889 {
890 return m_size; 890 return m_size;
891 } 891 }
892 892
893 bool HTMLInputElement::sizeShouldIncludeDecoration(int& preferredSize) const 893 bool HTMLInputElement::sizeShouldIncludeDecoration(int& preferredSize) const
894 { 894 {
895 return m_inputTypeView->sizeShouldIncludeDecoration(defaultSize, preferredSi ze); 895 return m_inputTypeView->sizeShouldIncludeDecoration(defaultSize, preferredSi ze);
(...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer()); 1881 return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer());
1882 } 1882 }
1883 #endif 1883 #endif
1884 1884
1885 bool HTMLInputElement::shouldDispatchFormControlChangeEvent(String& oldValue, St ring& newValue) 1885 bool HTMLInputElement::shouldDispatchFormControlChangeEvent(String& oldValue, St ring& newValue)
1886 { 1886 {
1887 return m_inputType->shouldDispatchFormControlChangeEvent(oldValue, newValue) ; 1887 return m_inputType->shouldDispatchFormControlChangeEvent(oldValue, newValue) ;
1888 } 1888 }
1889 1889
1890 } // namespace 1890 } // namespace
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFormControlElement.cpp ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698