Oilpan: Move ChromeClient classes into Oilpan heap.

Source/web/InspectorOverlayImpl.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 92 matching lines @@
         FrameView* view = m_overlay.overlayMainFrame()->view();
         ASSERT(!view->needsLayout());
         view->paint(&graphicsContext, IntRect(0, 0, view->width(), view->height()));
     }
 
 private:
     InspectorOverlayImpl& m_overlay;
 };
 
 
-class InspectorOverlayImpl::InspectorOverlayChromeClient final: public EmptyChromeClient {
+class InspectorOverlayImpl::InspectorOverlayChromeClient final : public EmptyChromeClient {
 public:
-    InspectorOverlayChromeClient(ChromeClient& client, InspectorOverlayImpl& overlay)
-        : m_client(client)
-        , m_overlay(overlay)
-    { }
+    static PassOwnPtrWillBeRawPtr<InspectorOverlayChromeClient> create(ChromeClient& client, InspectorOverlayImpl& overlay)
+    {
+        return adoptPtrWillBeNoop(new InspectorOverlayChromeClient(client, overlay));
+    }
+
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_overlay);
+        EmptyChromeClient::trace(visitor);
+    }
 
     void setCursor(const Cursor& cursor) override
     {
         m_client.setCursor(cursor);
     }
 
     void setToolTip(const String& tooltip, TextDirection direction) override
     {
         m_client.setToolTip(tooltip, direction);
     }
 
     void invalidateRect(const IntRect&) override
     {
-        m_overlay.invalidate();
+        m_overlay->invalidate();
     }
 
     void scheduleAnimation() override
     {
-        if (m_overlay.m_inLayout)
+        if (m_overlay->m_inLayout)
             return;
 
         m_client.scheduleAnimation();
     }
 
 private:
+    InspectorOverlayChromeClient(ChromeClient& client, InspectorOverlayImpl& overlay)
+        : m_client(client)
+        , m_overlay(&overlay)
+    { }
+
     ChromeClient& m_client;

[haraken, 2015/08/14 14:38:41]

This needs to be a RawPtrWillBeMember. It is dangerous to leave a raw pointer
that is not explicitly cleared when the pointing object dies.

[Yuta Kitamura, 2015/08/17 08:03:21]

Ouch, this was the one I intended to fix, but has slipped off
during several refactorings...

Done.

-    InspectorOverlayImpl& m_overlay;
+    RawPtrWillBeMember<InspectorOverlayImpl> m_overlay;
 };
 
 
 // static
 PassOwnPtrWillBeRawPtr<InspectorOverlay> InspectorOverlayImpl::createEmpty()
 {
     return adoptPtrWillBeNoop(new InspectorOverlayStub());
 }
 
 InspectorOverlayImpl::InspectorOverlayImpl(WebViewImpl* webViewImpl)
@@ skipping 14 matching lines @@
 InspectorOverlayImpl::~InspectorOverlayImpl()
 {
     ASSERT(!m_overlayPage);
 }
 
 DEFINE_TRACE(InspectorOverlayImpl)
 {
     visitor->trace(m_highlightNode);
     visitor->trace(m_eventTargetNode);
     visitor->trace(m_overlayPage);
+    visitor->trace(m_overlayChromeClient);
     visitor->trace(m_overlayHost);
     visitor->trace(m_listener);
     visitor->trace(m_layoutEditor);
     InspectorOverlay::trace(visitor);
 }
 
 void InspectorOverlayImpl::invalidate()
 {
     if (!m_pageOverlay)
         m_pageOverlay = PageOverlay::create(m_webViewImpl, adoptPtr(new InspectorPageOverlayDelegate(*this)));
@@ skipping 187 matching lines @@
 {
     if (m_overlayPage)
         return m_overlayPage.get();
 
     ScriptForbiddenScope::AllowUserAgentScript allowScript;
 
     static FrameLoaderClient* dummyFrameLoaderClient =  new EmptyFrameLoaderClient;
     Page::PageClients pageClients;
     fillWithEmptyClients(pageClients);
     ASSERT(!m_overlayChromeClient);
-    m_overlayChromeClient = adoptPtr(new InspectorOverlayChromeClient(m_webViewImpl->page()->chromeClient(), *this));
+    m_overlayChromeClient = InspectorOverlayChromeClient::create(m_webViewImpl->page()->chromeClient(), *this);
     pageClients.chromeClient = m_overlayChromeClient.get();
     m_overlayPage = adoptPtrWillBeNoop(new Page(pageClients));
 
     Settings& settings = m_webViewImpl->page()->settings();
     Settings& overlaySettings = m_overlayPage->settings();
 
     overlaySettings.genericFontFamilySettings().updateStandard(settings.genericFontFamilySettings().standard());
     overlaySettings.genericFontFamilySettings().updateSerif(settings.genericFontFamilySettings().serif());
     overlaySettings.genericFontFamilySettings().updateSansSerif(settings.genericFontFamilySettings().sansSerif());
     overlaySettings.genericFontFamilySettings().updateCursive(settings.genericFontFamilySettings().cursive());
@@ skipping 116 matching lines @@
     --m_suspendCount;
 }
 
 void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor)
 {
     m_layoutEditor = layoutEditor;
     m_overlayHost->setLayoutEditorListener(m_layoutEditor.get());
 }
 
 } // namespace blink