Index: Source/web/ColorChooserPopupUIController.cpp |
diff --git a/Source/web/ColorChooserPopupUIController.cpp b/Source/web/ColorChooserPopupUIController.cpp |
index c2bb507f2ccfc29d360dee903b3e70947683dde3..0f7e4dbf269b00cd47ff8f6ff93cd9cc78f4b2c3 100644 |
--- a/Source/web/ColorChooserPopupUIController.cpp |
+++ b/Source/web/ColorChooserPopupUIController.cpp |
@@ -47,7 +47,6 @@ enum ColorPickerPopupAction { |
ColorChooserPopupUIController::ColorChooserPopupUIController(LocalFrame* frame, ChromeClientImpl* chromeClient, ColorChooserClient* client) |
: ColorChooserUIController(frame, client) |
, m_chromeClient(chromeClient) |
- , m_client(client) |
, m_popup(0) |
, m_locale(Locale::defaultLocale()) |
{ |
@@ -55,6 +54,8 @@ ColorChooserPopupUIController::ColorChooserPopupUIController(LocalFrame* frame, |
ColorChooserPopupUIController::~ColorChooserPopupUIController() |
{ |
+ closePopup(); |
+ // ~ColorChooserUIController ends the ColorChooser. |
} |
void ColorChooserPopupUIController::openUI() |
@@ -69,8 +70,8 @@ void ColorChooserPopupUIController::endChooser() |
{ |
if (m_chooser) |
m_chooser->endChooser(); |
- if (m_popup) |
- closePopup(); |
+ |
+ closePopup(); |
} |
AXObject* ColorChooserPopupUIController::rootAXObject() |