third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp - Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

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/svg/graphics/SVGImage.cpp

Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/svg/animation/SVGSMILElement.cpp ('k') | third_party/WebKit/Source/core/xml/XPathValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

index 445d94625bfcd6d4d36aedafa356b432db45357f..2cc9f143a0e16c60099b64e5ce2d5c1ae45ae735 100644

--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

@@ -469,7 +469,7 @@

// types.

EventDispatchForbiddenScope::AllowUserAgentEvents allowUserAgentEvents;

- DEFINE_STATIC_LOCAL(FrameLoaderClient, dummyFrameLoaderClient, (EmptyFrameLoaderClient::create()));

+ DEFINE_STATIC_LOCAL(Persistent<FrameLoaderClient>, dummyFrameLoaderClient, (EmptyFrameLoaderClient::create()));

if (m_page) {

toLocalFrame(m_page->mainFrame())->loader().load(FrameLoadRequest(0, blankURL(), SubstituteData(data(), AtomicString("image/svg+xml"),

@@ -512,7 +512,7 @@

LocalFrame* frame = nullptr;

{

TRACE_EVENT0("blink", "SVGImage::dataChanged::createFrame");

- frame = LocalFrame::create(&dummyFrameLoaderClient, &page->frameHost(), 0);

+ frame = LocalFrame::create(dummyFrameLoaderClient.get(), &page->frameHost(), 0);

frame->setView(FrameView::create(frame));

frame->init();

}