diff options
| -rw-r--r-- | content/browser/web_contents/web_contents_view_aura.cc | 3 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 11 |
2 files changed, 3 insertions, 11 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index d525cdf..cbf9ec2 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -174,6 +174,9 @@ WebContentsViewAura::WebContentsViewAura( } WebContentsViewAura::~WebContentsViewAura() { + // Window needs a valid delegate during its destructor, so we explicitly + // delete it here. + window_.reset(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 4bafb97..000030f 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -5573,17 +5573,6 @@ fun:_ZN7WebCore18MainResourceLoader16didFinishLoadingEd } { - bug_122610 - Memcheck:Unaddressable - fun:_ZN4aura6WindowD0Ev - fun:_ZN10scoped_ptrIN4aura6WindowEED1Ev - fun:_ZN19WebContentsViewAuraD0Ev - fun:_ZN10scoped_ptrIN7content15WebContentsViewEED1Ev - fun:_ZN15WebContentsImplD0Ev - fun:_ZN10scoped_ptrIN7content11WebContentsEE5resetEPS1_ - fun:_ZN11BalloonHost8ShutdownEv -} -{ bug_122670 Memcheck:Leak fun:_Znw* |