Index: Source/core/html/forms/ColorInputType.cpp |
diff --git a/Source/core/html/forms/ColorInputType.cpp b/Source/core/html/forms/ColorInputType.cpp |
index 3edd2dead5a76c7375d62458d16633f54add6907..54ab45aa143171d0906f7a8d4d7690a6eddcf2e9 100644 |
--- a/Source/core/html/forms/ColorInputType.cpp |
+++ b/Source/core/html/forms/ColorInputType.cpp |
@@ -82,7 +82,20 @@ PassRefPtrWillBeRawPtr<InputType> ColorInputType::create(HTMLInputElement& eleme |
ColorInputType::~ColorInputType() |
{ |
- endColorChooser(); |
+ // The ColorChooser is responsible for 'ending' its own platform |
+ // object when being destructed, but will not indirectly notify |
+ // its ColorChooserClient when doing so (Oilpan friendly finalization.) |
+ // |
+ // So as to not miss out on anything, effect that notification locally. |
+ if (m_chooser) |
+ didEndChooser(); |
+} |
+ |
+void ColorInputType::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_chooser); |
+ BaseClickableWithKeyInputType::trace(visitor); |
+ ColorChooserClient::trace(visitor); |
} |
void ColorInputType::countUsage() |