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

Side by Side Diff: Source/core/html/HTMLInputElement.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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/HTMLInputElement.h ('k') | Source/core/html/HTMLKeygenElement.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 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 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 ASSERT(m_inputTypeView); 808 ASSERT(m_inputTypeView);
809 HTMLTextFormControlElement::finishParsingChildren(); 809 HTMLTextFormControlElement::finishParsingChildren();
810 if (!m_stateRestored) { 810 if (!m_stateRestored) {
811 bool checked = hasAttribute(checkedAttr); 811 bool checked = hasAttribute(checkedAttr);
812 if (checked) 812 if (checked)
813 setChecked(checked); 813 setChecked(checked);
814 m_reflectsCheckedAttribute = true; 814 m_reflectsCheckedAttribute = true;
815 } 815 }
816 } 816 }
817 817
818 bool HTMLInputElement::layoutObjectIsNeeded(const LayoutStyle& style) 818 bool HTMLInputElement::layoutObjectIsNeeded(const ComputedStyle& style)
819 { 819 {
820 return m_inputType->layoutObjectIsNeeded() && HTMLTextFormControlElement::la youtObjectIsNeeded(style); 820 return m_inputType->layoutObjectIsNeeded() && HTMLTextFormControlElement::la youtObjectIsNeeded(style);
821 } 821 }
822 822
823 LayoutObject* HTMLInputElement::createLayoutObject(const LayoutStyle& style) 823 LayoutObject* HTMLInputElement::createLayoutObject(const ComputedStyle& style)
824 { 824 {
825 return m_inputTypeView->createLayoutObject(style); 825 return m_inputTypeView->createLayoutObject(style);
826 } 826 }
827 827
828 void HTMLInputElement::attach(const AttachContext& context) 828 void HTMLInputElement::attach(const AttachContext& context)
829 { 829 {
830 HTMLTextFormControlElement::attach(context); 830 HTMLTextFormControlElement::attach(context);
831 831
832 m_inputTypeView->startResourceLoading(); 832 m_inputTypeView->startResourceLoading();
833 m_inputType->countUsage(); 833 m_inputType->countUsage();
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 bool HTMLInputElement::isInteractiveContent() const 1888 bool HTMLInputElement::isInteractiveContent() const
1889 { 1889 {
1890 return m_inputType->isInteractiveContent(); 1890 return m_inputType->isInteractiveContent();
1891 } 1891 }
1892 1892
1893 bool HTMLInputElement::supportsAutofocus() const 1893 bool HTMLInputElement::supportsAutofocus() const
1894 { 1894 {
1895 return m_inputType->isInteractiveContent(); 1895 return m_inputType->isInteractiveContent();
1896 } 1896 }
1897 1897
1898 PassRefPtr<LayoutStyle> HTMLInputElement::customStyleForLayoutObject() 1898 PassRefPtr<ComputedStyle> HTMLInputElement::customStyleForLayoutObject()
1899 { 1899 {
1900 return m_inputTypeView->customStyleForLayoutObject(originalStyleForLayoutObj ect()); 1900 return m_inputTypeView->customStyleForLayoutObject(originalStyleForLayoutObj ect());
1901 } 1901 }
1902 1902
1903 bool HTMLInputElement::shouldDispatchFormControlChangeEvent(String& oldValue, St ring& newValue) 1903 bool HTMLInputElement::shouldDispatchFormControlChangeEvent(String& oldValue, St ring& newValue)
1904 { 1904 {
1905 return m_inputType->shouldDispatchFormControlChangeEvent(oldValue, newValue) ; 1905 return m_inputType->shouldDispatchFormControlChangeEvent(oldValue, newValue) ;
1906 } 1906 }
1907 1907
1908 void HTMLInputElement::didNotifySubtreeInsertionsToDocument() 1908 void HTMLInputElement::didNotifySubtreeInsertionsToDocument()
(...skipping 14 matching lines...) Expand all
1923 void HTMLInputElement::ensurePrimaryContent() 1923 void HTMLInputElement::ensurePrimaryContent()
1924 { 1924 {
1925 m_inputTypeView->ensurePrimaryContent(); 1925 m_inputTypeView->ensurePrimaryContent();
1926 } 1926 }
1927 1927
1928 bool HTMLInputElement::hasFallbackContent() const 1928 bool HTMLInputElement::hasFallbackContent() const
1929 { 1929 {
1930 return m_inputTypeView->hasFallbackContent(); 1930 return m_inputTypeView->hasFallbackContent();
1931 } 1931 }
1932 } // namespace 1932 } // namespace
OLDNEW
« no previous file with comments | « Source/core/html/HTMLInputElement.h ('k') | Source/core/html/HTMLKeygenElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698