| OLD | NEW |
| 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 | 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 6 * rights reserved. | 6 * rights reserved. |
| 7 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 7 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 8 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org) | 8 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org) |
| 9 * Copyright (C) 2010 Google Inc. All rights reserved. | 9 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 10 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. | 10 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. |
| (...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 845 return m_inputType->layoutObjectIsNeeded() && | 845 return m_inputType->layoutObjectIsNeeded() && |
| 846 HTMLTextFormControlElement::layoutObjectIsNeeded(style); | 846 HTMLTextFormControlElement::layoutObjectIsNeeded(style); |
| 847 } | 847 } |
| 848 | 848 |
| 849 LayoutObject* HTMLInputElement::createLayoutObject(const ComputedStyle& style) { | 849 LayoutObject* HTMLInputElement::createLayoutObject(const ComputedStyle& style) { |
| 850 return m_inputTypeView->createLayoutObject(style); | 850 return m_inputTypeView->createLayoutObject(style); |
| 851 } | 851 } |
| 852 | 852 |
| 853 void HTMLInputElement::attachLayoutTree(const AttachContext& context) { | 853 void HTMLInputElement::attachLayoutTree(const AttachContext& context) { |
| 854 HTMLTextFormControlElement::attachLayoutTree(context); | 854 HTMLTextFormControlElement::attachLayoutTree(context); |
| 855 if (layoutObject()) { |
| 856 m_inputType->onAttachWithLayoutObject(); |
| 857 } |
| 855 | 858 |
| 856 m_inputTypeView->startResourceLoading(); | 859 m_inputTypeView->startResourceLoading(); |
| 857 m_inputType->countUsage(); | 860 m_inputType->countUsage(); |
| 858 | 861 |
| 859 if (document().focusedElement() == this) | 862 if (document().focusedElement() == this) |
| 860 document().updateFocusAppearanceSoon(SelectionBehaviorOnFocus::Restore); | 863 document().updateFocusAppearanceSoon(SelectionBehaviorOnFocus::Restore); |
| 861 } | 864 } |
| 862 | 865 |
| 863 void HTMLInputElement::detachLayoutTree(const AttachContext& context) { | 866 void HTMLInputElement::detachLayoutTree(const AttachContext& context) { |
| 867 if (layoutObject()) { |
| 868 m_inputType->onDetachWithLayoutObject(); |
| 869 } |
| 864 HTMLTextFormControlElement::detachLayoutTree(context); | 870 HTMLTextFormControlElement::detachLayoutTree(context); |
| 865 m_needsToUpdateViewValue = true; | 871 m_needsToUpdateViewValue = true; |
| 866 m_inputTypeView->closePopupView(); | 872 m_inputTypeView->closePopupView(); |
| 867 } | 873 } |
| 868 | 874 |
| 869 String HTMLInputElement::altText() const { | 875 String HTMLInputElement::altText() const { |
| 870 // http://www.w3.org/TR/1998/REC-html40-19980424/appendix/notes.html#altgen | 876 // http://www.w3.org/TR/1998/REC-html40-19980424/appendix/notes.html#altgen |
| 871 // also heavily discussed by Hixie on bugzilla | 877 // also heavily discussed by Hixie on bugzilla |
| 872 // note this is intentionally different to HTMLImageElement::altText() | 878 // note this is intentionally different to HTMLImageElement::altText() |
| 873 String alt = fastGetAttribute(altAttr); | 879 String alt = fastGetAttribute(altAttr); |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1946 | 1952 |
| 1947 bool HTMLInputElement::hasFallbackContent() const { | 1953 bool HTMLInputElement::hasFallbackContent() const { |
| 1948 return m_inputTypeView->hasFallbackContent(); | 1954 return m_inputTypeView->hasFallbackContent(); |
| 1949 } | 1955 } |
| 1950 | 1956 |
| 1951 void HTMLInputElement::setFilesFromPaths(const Vector<String>& paths) { | 1957 void HTMLInputElement::setFilesFromPaths(const Vector<String>& paths) { |
| 1952 return m_inputType->setFilesFromPaths(paths); | 1958 return m_inputType->setFilesFromPaths(paths); |
| 1953 } | 1959 } |
| 1954 | 1960 |
| 1955 } // namespace blink | 1961 } // namespace blink |
| OLD | NEW |