Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2539323002: PerformanceMonitor: do not maintain a vector of frames in the monitor, single ExecutionContext memb… (Closed)
Patch Set: review comments addressed Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/PerformanceMonitor.h » ('j') | third_party/WebKit/Source/core/frame/PerformanceMonitor.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 562818bc489268d2705db002be931d20c22c1dc0..0a4ceda489c9b0e47a28bb33ca225f326f62837d 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -391,6 +391,9 @@ void LocalFrame::detach(FrameDetachType type) {
// DCHECK(!m_isDetaching) here.
m_isDetaching = true;
+ if (!tree().parent() || !tree().parent()->isLocalFrame())
caseq 2016/12/01 02:45:30 Why not just check for isLocalRoot()?
+ m_performanceMonitor->shutdown();
+
PluginScriptForbiddenScope forbidPluginDestructorScripting;
m_loader.stopAllLoaders();
// Don't allow any new child frames to load in this frame: attaching a new
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/PerformanceMonitor.h » ('j') | third_party/WebKit/Source/core/frame/PerformanceMonitor.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698