Chromium Code Reviews

Unified Diff: Source/web/ColorChooserPopupUIController.cpp

Issue 631833002: Move color chooser objects to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make ColorChooserUIController::m_client protected, not private Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
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()

Powered by Google App Engine