Source/core/loader/FrameLoader.cpp - Issue 787143002: Enable SVGImage to dispatch events in the destructor.

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: Source/core/loader/FrameLoader.cpp

Issue 787143002: Enable SVGImage to dispatch events in the destructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Update according to esprehn's comment. Created 6 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 | « LayoutTests/svg/dispatch-event-crash-on-destruct-expected.txt ('k') | Source/core/svg/graphics/SVGImage.cpp » ('j') | Source/core/svg/graphics/SVGImage.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/loader/FrameLoader.cpp

diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp

index ffefbc45fbe89fa0b16e1b2ba3559ed6f2b6e2a5..01d4326be54b5652e0c393b36880fa12708553c4 100644

--- a/Source/core/loader/FrameLoader.cpp

+++ b/Source/core/loader/FrameLoader.cpp

@@ -79,6 +79,7 @@

#include "core/page/Page.h"

#include "core/page/WindowFeatures.h"

#include "core/page/scrolling/ScrollingCoordinator.h"

+#include "core/svg/graphics/SVGImage.h"

#include "core/xml/parser/XMLDocumentParser.h"

#include "platform/Logging.h"

#include "platform/UserGestureIndicator.h"

@@ -237,7 +238,7 @@ bool FrameLoader::closeURL()

saveScrollState();

// Should only send the pagehide event here if the current document exists.

- if (m_frame->document())

+ if (m_frame->document() && !SVGImage::isInSVGImage(m_frame->document()))

m_frame->document()->dispatchUnloadEvents();

stopLoading();