Add a debug overlay with information about web process resource usage.

<https://webkit.org/b/150599>

Unreviewed follow-up to r191849.

Add missing call to uninstall the PageOverlay if the ResourceUsageOverlay is being
disabled through the setting. This way you don't end up with an unremovable overlay
in the MiniBrowser.

* page/ResourceUsageOverlay.cpp:
(WebCore::ResourceUsageOverlay::~ResourceUsageOverlay):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index dae9e2e627e8b3a8bd94b65b1045f354150957c7..957b7acf08c1378030dfb34b007019c19554a29c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2015-10-31  Andreas Kling  <akling@apple.com>
+
+        Add a debug overlay with information about web process resource usage.
+        <https://webkit.org/b/150599>
+
+        Unreviewed follow-up to r191849.
+
+        Add missing call to uninstall the PageOverlay if the ResourceUsageOverlay is being
+        disabled through the setting. This way you don't end up with an unremovable overlay
+        in the MiniBrowser.
+
+        * page/ResourceUsageOverlay.cpp:
+        (WebCore::ResourceUsageOverlay::~ResourceUsageOverlay):
+
 2015-10-31  Brady Eidson  <beidson@apple.com>
 
         IDB: Date objects don't work as keys or values.

diff --git a/Source/WebCore/page/ResourceUsageOverlay.cpp b/Source/WebCore/page/ResourceUsageOverlay.cpp
index dc650aae694e5de87981a711d8fe8f6d3709bb38..f6bcd9faed52a5309acc0a183c81b90bdf115e00 100644 (file)
--- a/Source/WebCore/page/ResourceUsageOverlay.cpp
+++ b/Source/WebCore/page/ResourceUsageOverlay.cpp
@@ -50,6 +50,10 @@ ResourceUsageOverlay::ResourceUsageOverlay(Page& page)
 ResourceUsageOverlay::~ResourceUsageOverlay()
 {
     platformDestroy();
+
+    // FIXME: This is a hack so we don't try to uninstall the PageOverlay during Page destruction.
+    if (m_page.mainFrame().page())
+        m_page.mainFrame().pageOverlayController().uninstallPageOverlay(m_overlay.get(), PageOverlay::FadeMode::DoNotFade);
 }
 
 bool ResourceUsageOverlay::mouseEvent(PageOverlay&, const PlatformMouseEvent& event)