third_party/WebKit/Source/core/dom/Document.cpp - Issue 1914183002: Simplify ownership handling of HTMLImportsController.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1914183002: Simplify ownership handling of HTMLImportsController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: drop Finalized Created 4 years, 8 months 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 | « third_party/WebKit/Source/core/dom/Document.h ('k') | third_party/WebKit/Source/core/html/imports/HTMLImportsController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.cpp

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp

index 86461d98f0a7853cde6527ded0bac20f16c50ce8..9026eb77bb77ce6136f89d7ee932392703001b48 100644

--- a/third_party/WebKit/Source/core/dom/Document.cpp

+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -2227,8 +2227,10 @@ void Document::detach(const AttachContext& context)

// If this document is the master for an HTMLImportsController, sever that

// relationship. This ensures that we don't leave import loads in flight,

// thinking they should have access to a valid frame when they don't.

- if (m_importsController)

- HTMLImportsController::removeFrom(*this);

+ if (m_importsController) {

+ m_importsController->dispose();

+ setImportsController(nullptr);

+ }

m_timers.setTimerTaskRunner(

Platform::current()->currentThread()->scheduler()->timerTaskRunner()->adoptClone());