| 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 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 150 |
| 151 void HTMLInputElement::willAddFirstAuthorShadowRoot() | 151 void HTMLInputElement::willAddFirstAuthorShadowRoot() |
| 152 { | 152 { |
| 153 m_inputTypeView->destroyShadowSubtree(); | 153 m_inputTypeView->destroyShadowSubtree(); |
| 154 m_inputTypeView = InputTypeView::create(*this); | 154 m_inputTypeView = InputTypeView::create(*this); |
| 155 lazyReattachIfAttached(); | 155 lazyReattachIfAttached(); |
| 156 } | 156 } |
| 157 | 157 |
| 158 HTMLInputElement::~HTMLInputElement() | 158 HTMLInputElement::~HTMLInputElement() |
| 159 { | 159 { |
| 160 #if !ENABLE(OILPAN) |
| 160 // Need to remove form association while this is still an HTMLInputElement | 161 // Need to remove form association while this is still an HTMLInputElement |
| 161 // so that virtual functions are called correctly. | 162 // so that virtual functions are called correctly. |
| 162 setForm(0); | 163 setForm(0); |
| 163 // setForm(0) may register this to a document-level radio button group. | 164 // setForm(0) may register this to a document-level radio button group. |
| 164 // We should unregister it to avoid accessing a deleted object. | 165 // We should unregister it to avoid accessing a deleted object. |
| 165 if (isRadioButton()) | 166 if (isRadioButton()) |
| 166 document().formController().radioButtonGroupScope().removeButton(this); | 167 document().formController().radioButtonGroupScope().removeButton(this); |
| 167 if (m_hasTouchEventHandler) | 168 if (m_hasTouchEventHandler) |
| 168 document().didRemoveTouchEventHandler(this); | 169 document().didRemoveTouchEventHandler(this); |
| 170 #endif |
| 169 } | 171 } |
| 170 | 172 |
| 171 const AtomicString& HTMLInputElement::name() const | 173 const AtomicString& HTMLInputElement::name() const |
| 172 { | 174 { |
| 173 return m_name.isNull() ? emptyAtom : m_name; | 175 return m_name.isNull() ? emptyAtom : m_name; |
| 174 } | 176 } |
| 175 | 177 |
| 176 Vector<FileChooserFileInfo> HTMLInputElement::filesFromFileInputFormControlState
(const FormControlState& state) | 178 Vector<FileChooserFileInfo> HTMLInputElement::filesFromFileInputFormControlState
(const FormControlState& state) |
| 177 { | 179 { |
| 178 return FileInputType::filesFromFormControlState(state); | 180 return FileInputType::filesFromFormControlState(state); |
| (...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1876 } | 1878 } |
| 1877 | 1879 |
| 1878 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) | 1880 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) |
| 1879 PassRefPtr<RenderStyle> HTMLInputElement::customStyleForRenderer() | 1881 PassRefPtr<RenderStyle> HTMLInputElement::customStyleForRenderer() |
| 1880 { | 1882 { |
| 1881 return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer()); | 1883 return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer()); |
| 1882 } | 1884 } |
| 1883 #endif | 1885 #endif |
| 1884 | 1886 |
| 1885 } // namespace | 1887 } // namespace |
| OLD | NEW |