summaryrefslogtreecommitdiff
path: root/chromium/components/ui_devtools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/ui_devtools
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/ui_devtools')
-rw-r--r--chromium/components/ui_devtools/agent_util.cc1
-rw-r--r--chromium/components/ui_devtools/views/dom_agent_mac.mm5
-rw-r--r--chromium/components/ui_devtools/views/overlay_agent_mac.mm1
-rw-r--r--chromium/components/ui_devtools/views/widget_element.cc1
4 files changed, 7 insertions, 1 deletions
diff --git a/chromium/components/ui_devtools/agent_util.cc b/chromium/components/ui_devtools/agent_util.cc
index 6334a2178de..fc4c83da8ce 100644
--- a/chromium/components/ui_devtools/agent_util.cc
+++ b/chromium/components/ui_devtools/agent_util.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/logging.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/task/post_task.h"
diff --git a/chromium/components/ui_devtools/views/dom_agent_mac.mm b/chromium/components/ui_devtools/views/dom_agent_mac.mm
index 0a1e30bcc82..59fc8fdac3a 100644
--- a/chromium/components/ui_devtools/views/dom_agent_mac.mm
+++ b/chromium/components/ui_devtools/views/dom_agent_mac.mm
@@ -12,7 +12,10 @@
namespace ui_devtools {
DOMAgentMac::DOMAgentMac() {}
-DOMAgentMac::~DOMAgentMac() {}
+
+DOMAgentMac::~DOMAgentMac() {
+ CHECK(!IsInObserverList());
+}
protocol::Response DOMAgentMac::enable() {
views::NativeWidgetMac::SetInitNativeWidgetCallback(base::BindRepeating(
diff --git a/chromium/components/ui_devtools/views/overlay_agent_mac.mm b/chromium/components/ui_devtools/views/overlay_agent_mac.mm
index 308f91b5510..803809fd399 100644
--- a/chromium/components/ui_devtools/views/overlay_agent_mac.mm
+++ b/chromium/components/ui_devtools/views/overlay_agent_mac.mm
@@ -17,6 +17,7 @@ OverlayAgentMac::OverlayAgentMac(DOMAgent* dom_agent)
OverlayAgentMac::~OverlayAgentMac() {
if (is_pretarget_handler_)
RemovePreTargetHandler();
+ CHECK(!IsInObserverList());
}
void OverlayAgentMac::InstallPreTargetHandler() {
diff --git a/chromium/components/ui_devtools/views/widget_element.cc b/chromium/components/ui_devtools/views/widget_element.cc
index 086e6617bab..ccd786d0b63 100644
--- a/chromium/components/ui_devtools/views/widget_element.cc
+++ b/chromium/components/ui_devtools/views/widget_element.cc
@@ -23,6 +23,7 @@ WidgetElement::~WidgetElement() {
widget_->RemoveRemovalsObserver(this);
widget_->RemoveObserver(this);
}
+ CHECK(!IsInObserverList());
}
void WidgetElement::OnWillRemoveView(views::Widget* widget, views::View* view) {