third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp - Issue 1642283002: Deal with frame removal by content scripts

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/web/FrameLoaderClientImpl.cpp

Issue 1642283002: Deal with frame removal by content scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Push down WeakPtr Created 4 years, 10 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:

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

index 52ee4f1a7678400ca8010c421f8f26f3ead63d81..965b5aaa305fc7bd75db1ce42a095e41be24f046 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

@@ -177,8 +177,12 @@ void FrameLoaderClientImpl::dispatchDidClearWindowObjectInMainWorld()

void FrameLoaderClientImpl::documentElementAvailable()

{

- if (m_webFrame->client())

+ if (m_webFrame->client()) {

+ RefPtrWillBeRawPtr<WebLocalFrameImpl> protector(m_webFrame.get());

m_webFrame->client()->didCreateDocumentElement(m_webFrame);

+ if (!m_webFrame->client())

+ return;

+ }

if (m_webFrame->parent())

return;