Source/WebCore/loader/FrameLoader.cpp - Issue 13646003: DevTools: Remove ENABLE(INSPECTOR) and ENABLE(JAVASCRIPT_DEBUGGER) from the code.

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/FrameLoader.cpp

Issue 13646003: DevTools: Remove ENABLE(INSPECTOR) and ENABLE(JAVASCRIPT_DEBUGGER) from the code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

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

« Source/WebCore/loader/DocumentThreadableLoader.cpp ('K') | « Source/WebCore/loader/DocumentThreadableLoader.cpp ('k') | Source/WebCore/loader/ResourceLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/loader/FrameLoader.cpp

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

index 87c8750315a93a174fc65beca39698072572f003..9b052f36ef87f514663d79f09a27f725226775bc 100644

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

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

@@ -2807,12 +2807,10 @@ void FrameLoader::continueLoadAfterNavigationPolicy(const ResourceRequest&, Pass

if (!m_frame->page())

return;

-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)

if (Page* page = m_frame->page()) {

if (page->mainFrame() == m_frame)

m_frame->page()->inspectorController()->resume();

}

-#endif

setProvisionalDocumentLoader(m_policyDocumentLoader.get());

m_loadType = type;

@@ -3224,10 +3222,8 @@ void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)

m_client->dispatchDidClearWindowObjectInWorld(world);

-#if ENABLE(INSPECTOR)

if (Page* page = m_frame->page())

page->inspectorController()->didClearWindowObjectInWorld(m_frame, world);

-#endif

InspectorInstrumentation::didClearWindowObjectInWorld(m_frame, world);

}