commit c29f20c8bd73d5c6e3c0bd45e11c1bcf738ceb37
author sigbjornf <sigbjornf@opera.com> Sun Nov 22 10:36:53 2015
committer Commit bot <commit-bot@chromium.org> Sun Nov 22 10:37:48 2015
tree 3b0bf126aea8c4390a3f5957e6d2ac3b46c28d35
parent ea35a9c6228d6e3c743a29fcc601e1e5bf16f283

Oilpan: trace ColorChooserPopupUIController::m_chromeClient

R=haraken
BUG=553613

Review URL: https://codereview.chromium.org/1442543003

Cr-Commit-Position: refs/heads/master@{#361043}

third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp

diff --git a/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp b/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp
index e790461..2d8f22d 100644
--- a/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp
+++ b/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp
@@ -47,17 +47,34 @@
 ColorChooserPopupUIController::ColorChooserPopupUIController(LocalFrame* frame, ChromeClientImpl* chromeClient, ColorChooserClient* client)
     : ColorChooserUIController(frame, client)
     , m_chromeClient(chromeClient)
-    , m_popup(0)
+    , m_popup(nullptr)
     , m_locale(Locale::defaultLocale())
 {
+#if ENABLE(OILPAN)
+    ThreadState::current()->registerPreFinalizer(this);
+#endif
 }
 
 ColorChooserPopupUIController::~ColorChooserPopupUIController()
 {
+#if !ENABLE(OILPAN)
     closePopup();
+#endif
     // ~ColorChooserUIController ends the ColorChooser.
 }
 
+void ColorChooserPopupUIController::dispose()
+{
+    // Finalized earlier so as to access m_chromeClient while alive.
+    closePopup();
+}
+
+DEFINE_TRACE(ColorChooserPopupUIController)
+{
+    visitor->trace(m_chromeClient);
+    ColorChooserUIController::trace(visitor);
+}
+
 void ColorChooserPopupUIController::openUI()
 {
     if (m_client->shouldShowSuggestions())
@@ -76,7 +93,7 @@
 
 AXObject* ColorChooserPopupUIController::rootAXObject()
 {
-    return m_popup ? m_popup->rootAXObject() : 0;
+    return m_popup ? m_popup->rootAXObject() : nullptr;
 }
 
 void ColorChooserPopupUIController::writeDocument(SharedBuffer* data)
@@ -128,7 +145,7 @@
 
 void ColorChooserPopupUIController::didClosePopup()
 {
-    m_popup = 0;
+    m_popup = nullptr;
 
     if (!m_chooser)
         didEndChooser();

third_party/WebKit/Source/web/ColorChooserPopupUIController.h

diff --git a/third_party/WebKit/Source/web/ColorChooserPopupUIController.h b/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
index 155210b..30995601 100644
--- a/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
+++ b/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
@@ -37,7 +37,7 @@
 class PagePopup;
 
 class ColorChooserPopupUIController final : public ColorChooserUIController, public PagePopupClient  {
-
+    WILL_BE_USING_PRE_FINALIZER(ColorChooserPopupUIController, dispose);
 public:
     static PassOwnPtrWillBeRawPtr<ColorChooserPopupUIController> create(LocalFrame* frame, ChromeClientImpl* chromeClient, ColorChooserClient* client)
     {
@@ -45,6 +45,7 @@
     }
 
     ~ColorChooserPopupUIController() override;
+    DECLARE_VIRTUAL_TRACE();
 
     // ColorChooserUIController functions:
     void openUI() override;
@@ -67,8 +68,9 @@
     ColorChooserPopupUIController(LocalFrame*, ChromeClientImpl*, ColorChooserClient*);
 
     void openPopup();
+    void dispose();
 
-    ChromeClientImpl* m_chromeClient;
+    RawPtrWillBeMember<ChromeClientImpl> m_chromeClient;
     PagePopup* m_popup;
     Locale& m_locale;
 };