<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190790] branches/safari-601.1.46-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190790">190790</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-09 07:21:37 -0700 (Fri, 09 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189834">r189834</a>. rdar://problem/22807373</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoredebuggerDebuggercpp">branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoredebuggerDebuggerh">branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.h</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorControllercpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorControllerh">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationcpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorPageDebuggerAgentcpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorPageDebuggerAgenth">branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderFrameLoadercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189834. rdar://problem/22807373
+
+ 2015-09-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Paused Debugger prevents page reload
+ https://bugs.webkit.org/show_bug.cgi?id=148174
+
+ Reviewed by Brian Burg.
+
+ * debugger/Debugger.h:
+ (JSC::Debugger::suppressAllPauses):
+ (JSC::Debugger::setSuppressAllPauses):
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::Debugger):
+ (JSC::Debugger::pauseIfNeeded):
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::setSuppressAllPauses):
+ Provide a way to suppress pauses.
+
+2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189460. rdar://problem/22823239
</span><span class="cx">
</span><span class="cx"> 2015-09-06 Mark Lam <mark.lam@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.cpp (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.cpp 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.cpp 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -160,6 +160,7 @@
</span><span class="cx"> , m_breakpointsActivated(true)
</span><span class="cx"> , m_hasHandlerForExceptionCallback(false)
</span><span class="cx"> , m_isInWorkerThread(isInWorkerThread)
</span><ins>+ , m_suppressAllPauses(false)
</ins><span class="cx"> , m_steppingMode(SteppingModeDisabled)
</span><span class="cx"> , m_reasonForPause(NotPaused)
</span><span class="cx"> , m_pauseOnCallFrame(0)
</span><span class="lines">@@ -648,6 +649,9 @@
</span><span class="cx"> if (m_isPaused)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (m_suppressAllPauses)
+ return;
+
</ins><span class="cx"> JSGlobalObject* vmEntryGlobalObject = callFrame->vmEntryGlobalObject();
</span><span class="cx"> if (!needPauseHandling(vmEntryGlobalObject))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.h (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.h 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.h 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -108,6 +108,9 @@
</span><span class="cx"> bool isPaused() const { return m_isPaused; }
</span><span class="cx"> bool isStepping() const { return m_steppingMode == SteppingModeEnabled; }
</span><span class="cx">
</span><ins>+ bool suppressAllPauses() const { return m_suppressAllPauses; }
+ void setSuppressAllPauses(bool suppress) { m_suppressAllPauses = suppress; }
+
</ins><span class="cx"> virtual void sourceParsed(ExecState*, SourceProvider*, int errorLineNumber, const WTF::String& errorMessage) = 0;
</span><span class="cx">
</span><span class="cx"> void exception(CallFrame*, JSValue exceptionValue, bool hasCatchHandler);
</span><span class="lines">@@ -196,6 +199,7 @@
</span><span class="cx"> bool m_breakpointsActivated : 1;
</span><span class="cx"> bool m_hasHandlerForExceptionCallback : 1;
</span><span class="cx"> bool m_isInWorkerThread : 1;
</span><ins>+ bool m_suppressAllPauses : 1;
</ins><span class="cx"> unsigned m_steppingMode : 1; // SteppingMode
</span><span class="cx">
</span><span class="cx"> ReasonForPause m_reasonForPause;
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -136,6 +136,11 @@
</span><span class="cx"> return scriptDebugServer().isPaused();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorDebuggerAgent::setSuppressAllPauses(bool suppress)
+{
+ scriptDebugServer().setSuppressAllPauses(suppress);
+}
+
</ins><span class="cx"> static RefPtr<InspectorObject> buildAssertPauseReason(const String& message)
</span><span class="cx"> {
</span><span class="cx"> auto reason = Inspector::Protocol::Debugger::AssertPauseReason::create().release();
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -88,7 +88,9 @@
</span><span class="cx"> virtual void setOverlayMessage(ErrorString&, const String*) override;
</span><span class="cx">
</span><span class="cx"> bool isPaused();
</span><del>-
</del><ins>+
+ void setSuppressAllPauses(bool);
+
</ins><span class="cx"> void handleConsoleAssert(const String& message);
</span><span class="cx">
</span><span class="cx"> void schedulePauseOnNextStatement(DebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189834. rdar://problem/22807373
+
+ 2015-09-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Paused Debugger prevents page reload
+ https://bugs.webkit.org/show_bug.cgi?id=148174
+
+ Reviewed by Brian Burg.
+
+ When navigating the page while paused, suppress any pausing until the page
+ has completed navigation. If not paused and navigating, you can still pause
+ in pagehide and unload handlers or other late page events.
+
+ Could not write a reliable test for this at the moment.
+ InspectorTest.reloadPage has multiple issues with the output,
+ so I'll investigate making reload tests more reliable later.
+
+ * inspector/InspectorController.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::resume): Deleted.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
+ We now use existing InspectorInstrumentation functions instead of a method
+ on InspectorController during load. In dropping the method InspectorController
+ can drop a member variable no longer used.
+
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::willStartProvisionalLoad):
+ Add a new instrumentation hook.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::willStartProvisionalLoadImpl):
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ When starting or completing main frame navigations, let the PageDebuggerAgent do some work.
+
+ * inspector/PageDebuggerAgent.h:
+ * inspector/PageDebuggerAgent.cpp:
+ (WebCore::PageDebuggerAgent::mainFrameStartedLoading):
+ (WebCore::PageDebuggerAgent::mainFrameStoppedLoading):
+ (WebCore::PageDebuggerAgent::mainFrameNavigated):
+ Suppress pausing if navigating while paused. Otherwise behave as normal.
+
+2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189421. rdar://problem/22823243
</span><span class="cx">
</span><span class="cx"> 2015-09-04 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.cpp (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.cpp 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.cpp 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -150,10 +150,10 @@
</span><span class="cx"> m_agents.append(WTF::move(consoleAgentPtr));
</span><span class="cx">
</span><span class="cx"> auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), pageAgent, m_overlay.get());
</span><del>- m_debuggerAgent = debuggerAgentPtr.get();
</del><ins>+ PageDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
</ins><span class="cx"> m_agents.append(WTF::move(debuggerAgentPtr));
</span><span class="cx">
</span><del>- auto domDebuggerAgentPtr = std::make_unique<InspectorDOMDebuggerAgent>(m_instrumentingAgents.get(), m_domAgent, m_debuggerAgent);
</del><ins>+ auto domDebuggerAgentPtr = std::make_unique<InspectorDOMDebuggerAgent>(m_instrumentingAgents.get(), m_domAgent, debuggerAgent);
</ins><span class="cx"> m_domDebuggerAgent = domDebuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(domDebuggerAgentPtr));
</span><span class="cx">
</span><span class="lines">@@ -171,8 +171,8 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
- m_timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</del><ins>+ runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
+ m_timelineAgent->setPageScriptDebugServer(&debuggerAgent->scriptDebugServer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorController::~InspectorController()
</span><span class="lines">@@ -397,14 +397,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::resume()
-{
- if (m_debuggerAgent) {
- ErrorString unused;
- m_debuggerAgent->resume(unused);
- }
-}
-
</del><span class="cx"> bool InspectorController::developerExtrasEnabled() const
</span><span class="cx"> {
</span><span class="cx"> return m_page.settings().developerExtrasEnabled();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.h (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.h 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.h 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -123,8 +123,6 @@
</span><span class="cx"> WEBCORE_EXPORT bool profilerEnabled() const;
</span><span class="cx"> WEBCORE_EXPORT void setProfilerEnabled(bool);
</span><span class="cx">
</span><del>- void resume();
-
</del><span class="cx"> InspectorClient* inspectorClient() const { return m_inspectorClient; }
</span><span class="cx"> InspectorPageAgent* pageAgent() const { return m_pageAgent; }
</span><span class="cx">
</span><span class="lines">@@ -150,7 +148,6 @@
</span><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><span class="cx"> InspectorResourceAgent* m_resourceAgent;
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><del>- PageDebuggerAgent* m_debuggerAgent;
</del><span class="cx"> InspectorDOMDebuggerAgent* m_domDebuggerAgent;
</span><span class="cx"> InspectorTimelineAgent* m_timelineAgent;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -772,6 +772,9 @@
</span><span class="cx">
</span><span class="cx"> if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents.inspectorLayerTreeAgent())
</span><span class="cx"> layerTreeAgent->reset();
</span><ins>+
+ if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
+ pageDebuggerAgent->mainFrameNavigated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent())
</span><span class="lines">@@ -802,12 +805,22 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
</span><span class="cx"> {
</span><ins>+ if (frame.isMainFrame()) {
+ if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
+ pageDebuggerAgent->mainFrameStartedLoading();
+ }
+
</ins><span class="cx"> if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
</span><span class="cx"> inspectorPageAgent->frameStartedLoading(frame);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
</span><span class="cx"> {
</span><ins>+ if (frame.isMainFrame()) {
+ if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
+ pageDebuggerAgent->mainFrameStoppedLoading();
+ }
+
</ins><span class="cx"> if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
</span><span class="cx"> inspectorPageAgent->frameStoppedLoading(frame);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorPageDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.cpp (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.cpp 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.cpp 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -144,4 +144,23 @@
</span><span class="cx"> didClearGlobalObject();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageDebuggerAgent::mainFrameStartedLoading()
+{
+ if (isPaused()) {
+ setSuppressAllPauses(true);
+ ErrorString unused;
+ resume(unused);
+ }
+}
+
+void PageDebuggerAgent::mainFrameStoppedLoading()
+{
+ setSuppressAllPauses(false);
+}
+
+void PageDebuggerAgent::mainFrameNavigated()
+{
+ setSuppressAllPauses(false);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorPageDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.h (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.h 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.h 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -51,6 +51,10 @@
</span><span class="cx">
</span><span class="cx"> void didClearMainFrameWindowObject();
</span><span class="cx">
</span><ins>+ void mainFrameStartedLoading();
+ void mainFrameStoppedLoading();
+ void mainFrameNavigated();
+
</ins><span class="cx"> virtual PageScriptDebugServer& scriptDebugServer() override;
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp (190789 => 190790)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp 2015-10-09 14:21:29 UTC (rev 190789)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp 2015-10-09 14:21:37 UTC (rev 190790)
</span><span class="lines">@@ -2982,11 +2982,6 @@
</span><span class="cx"> if (!m_frame.page())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (Page* page = m_frame.page()) {
- if (m_frame.isMainFrame())
- page->inspectorController().resume();
- }
-
</del><span class="cx"> setProvisionalDocumentLoader(m_policyDocumentLoader.get());
</span><span class="cx"> m_loadType = type;
</span><span class="cx"> setState(FrameStateProvisional);
</span></span></pre>
</div>
</div>
</body>
</html>