Source/WebCore/loader/MainResourceLoader.cpp - Issue 9375012: Merge 106662 - inspector/debugger/pause-in-inline-script.html asserts in chromium debug

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/WebCore/loader/MainResourceLoader.cpp

Issue 9375012: Merge 106662 - inspector/debugger/pause-in-inline-script.html asserts in chromium debug (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/WebCore/loader/MainResourceLoader.cpp

===================================================================

--- Source/WebCore/loader/MainResourceLoader.cpp (revision 107228)

+++ Source/WebCore/loader/MainResourceLoader.cpp (working copy)

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

// There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.

// See <rdar://problem/6304600> for more details.

#if !USE(CF)

- ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url()) || !defersLoading());

+ ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url()) || !defersLoading() || InspectorInstrumentation::isDebuggerPaused(m_frame.get()));

#endif

// The additional processing can do anything including possibly removing the last

« no previous file with comments | « Source/WebCore/inspector/InspectorInstrumentation.cpp ('k') | no next file » | no next file with comments »