Oilpan: turn DOMWindow into a heap supplementable.

Source/core/page/DOMWindowPagePopup.cpp

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 namespace WebCore {
 
 DOMWindowPagePopup::DOMWindowPagePopup(PagePopupClient* popupClient)
     : m_controller(PagePopupController::create(popupClient))
 {
     ASSERT(popupClient);
 }
 
 DOMWindowPagePopup::~DOMWindowPagePopup()
 {
-    m_controller->clearPagePopupClient();
 }
 
 const char* DOMWindowPagePopup::supplementName()
 {
     return "DOMWindowPagePopup";
 }
 
 PagePopupController* DOMWindowPagePopup::pagePopupController(DOMWindow& window)
 {
     DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(&window, supplementName()));
     ASSERT(supplement);
     return supplement->m_controller.get();
 }
 
 void DOMWindowPagePopup::install(DOMWindow& window, PagePopupClient* popupClient)
 {
     ASSERT(popupClient);
-    provideTo(window, supplementName(), adoptPtr(new DOMWindowPagePopup(popupClient)));
+    provideTo(window, supplementName(), adoptPtrWillBeNoop(new DOMWindowPagePopup(popupClient)));
 }
 
 void DOMWindowPagePopup::uninstall(DOMWindow& window)
 {
+    DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(&window, supplementName()));
+    if (supplement)

[haraken, 2014/03/27 00:59:03]

Is it possible that supplement is 0 ?

If no, I'd just write:

  pagePopupController(window)->clearPagePopupClient();

[sof, 2014/03/27 07:25:51]

Much better that way; done.

+        supplement->m_controller->clearPagePopupClient();
     window.removeSupplement(supplementName());
 }
 
+void DOMWindowPagePopup::trace(Visitor* visitor)
+{
+    visitor->trace(m_controller);
 }
+
+}