OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
55 PassRefPtrWillBeRawPtr<PickerIndicatorElement> PickerIndicatorElement::create(Do cument& document, PickerIndicatorOwner& pickerIndicatorOwner) | 55 PassRefPtrWillBeRawPtr<PickerIndicatorElement> PickerIndicatorElement::create(Do cument& document, PickerIndicatorOwner& pickerIndicatorOwner) |
56 { | 56 { |
57 RefPtrWillBeRawPtr<PickerIndicatorElement> element = adoptRefWillBeRefCounte dGarbageCollected(new PickerIndicatorElement(document, pickerIndicatorOwner)); | 57 RefPtrWillBeRawPtr<PickerIndicatorElement> element = adoptRefWillBeRefCounte dGarbageCollected(new PickerIndicatorElement(document, pickerIndicatorOwner)); |
58 element->setShadowPseudoId(AtomicString("-webkit-calendar-picker-indicator", AtomicString::ConstructFromLiteral)); | 58 element->setShadowPseudoId(AtomicString("-webkit-calendar-picker-indicator", AtomicString::ConstructFromLiteral)); |
59 element->setAttribute(idAttr, ShadowElementNames::pickerIndicator()); | 59 element->setAttribute(idAttr, ShadowElementNames::pickerIndicator()); |
60 return element.release(); | 60 return element.release(); |
61 } | 61 } |
62 | 62 |
63 PickerIndicatorElement::~PickerIndicatorElement() | 63 PickerIndicatorElement::~PickerIndicatorElement() |
64 { | 64 { |
65 closePopup(); | |
66 ASSERT(!m_chooser); | |
haraken
2014/06/05 04:59:25
Shall we leave this ASSERT in non-oilpan builds? I
keishi
2014/06/05 08:06:39
This ASSERT is working because PickerIndicatorElem
| |
67 } | 65 } |
68 | 66 |
69 RenderObject* PickerIndicatorElement::createRenderer(RenderStyle*) | 67 RenderObject* PickerIndicatorElement::createRenderer(RenderStyle*) |
70 { | 68 { |
71 return new RenderDetailsMarker(this); | 69 return new RenderDetailsMarker(this); |
72 } | 70 } |
73 | 71 |
74 void PickerIndicatorElement::defaultEventHandler(Event* event) | 72 void PickerIndicatorElement::defaultEventHandler(Event* event) |
75 { | 73 { |
76 if (!renderer()) | 74 if (!renderer()) |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
147 } | 145 } |
148 | 146 |
149 bool PickerIndicatorElement::isPickerIndicatorElement() const | 147 bool PickerIndicatorElement::isPickerIndicatorElement() const |
150 { | 148 { |
151 return true; | 149 return true; |
152 } | 150 } |
153 | 151 |
154 void PickerIndicatorElement::trace(Visitor* visitor) | 152 void PickerIndicatorElement::trace(Visitor* visitor) |
155 { | 153 { |
156 visitor->trace(m_pickerIndicatorOwner); | 154 visitor->trace(m_pickerIndicatorOwner); |
155 visitor->trace(m_chooser); | |
157 HTMLDivElement::trace(visitor); | 156 HTMLDivElement::trace(visitor); |
157 DateTimeChooserClient::trace(visitor); | |
158 } | 158 } |
159 | 159 |
160 } | 160 } |
161 | 161 |
162 #endif | 162 #endif |
OLD | NEW |