Changeset 190790 in webkit

Timestamp:

Oct 9, 2015 7:21:37 AM (9 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r189834. rdar://problem/22807373

Location:

branches/safari-601.1.46-branch/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/debugger/Debugger.cpp (modified) (2 diffs)
• JavaScriptCore/debugger/Debugger.h (modified) (2 diffs)
• JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (modified) (1 diff)
• JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (3 diffs)
• WebCore/inspector/InspectorController.h (modified) (2 diffs)
• WebCore/inspector/InspectorInstrumentation.cpp (modified) (3 diffs)
• WebCore/inspector/PageDebuggerAgent.cpp (modified) (1 diff)
• WebCore/inspector/PageDebuggerAgent.h (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)

branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-10-08  Matthew Hanson  <matthew_hanson@apple.com>
+
+        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>
 

branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -161 +161 @@
     , m_hasHandlerForExceptionCallback(false)
     , m_isInWorkerThread(isInWorkerThread)
+    , m_suppressAllPauses(false)
     , m_steppingMode(SteppingModeDisabled)
     , m_reasonForPause(NotPaused)
@@ -649 +650 @@
         return;
 
+    if (m_suppressAllPauses)
+        return;
+
     JSGlobalObject* vmEntryGlobalObject = callFrame->vmEntryGlobalObject();
     if (!needPauseHandling(vmEntryGlobalObject))

branches/safari-601.1.46-branch/Source/JavaScriptCore/debugger/Debugger.h

@@ -109 +109 @@
     bool isStepping() const { return m_steppingMode == SteppingModeEnabled; }
 
+    bool suppressAllPauses() const { return m_suppressAllPauses; }
+    void setSuppressAllPauses(bool suppress) { m_suppressAllPauses = suppress; }
+
     virtual void sourceParsed(ExecState*, SourceProvider*, int errorLineNumber, const WTF::String& errorMessage) = 0;
 
@@ -197 +200 @@
     bool m_hasHandlerForExceptionCallback : 1;
     bool m_isInWorkerThread : 1;
+    bool m_suppressAllPauses : 1;
     unsigned m_steppingMode : 1; // SteppingMode
 

branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp

@@ -135 +135 @@
 {
     return scriptDebugServer().isPaused();
+}
+
+void InspectorDebuggerAgent::setSuppressAllPauses(bool suppress)
+{
+    scriptDebugServer().setSuppressAllPauses(suppress);
 }
 

branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h

@@ -89 +89 @@
 
     bool isPaused();
-    
+
+    void setSuppressAllPauses(bool);
+
     void handleConsoleAssert(const String& message);
 

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-08  Matthew Hanson  <matthew_hanson@apple.com>
+
+        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>
 

branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.cpp

@@ -151 +151 @@
 
     auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), pageAgent, m_overlay.get());
-    m_debuggerAgent = debuggerAgentPtr.get();
+    PageDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
     m_agents.append(WTF::move(debuggerAgentPtr));
 
-    auto domDebuggerAgentPtr = std::make_unique<InspectorDOMDebuggerAgent>(m_instrumentingAgents.get(), m_domAgent, m_debuggerAgent);
+    auto domDebuggerAgentPtr = std::make_unique<InspectorDOMDebuggerAgent>(m_instrumentingAgents.get(), m_domAgent, debuggerAgent);
     m_domDebuggerAgent = domDebuggerAgentPtr.get();
     m_agents.append(WTF::move(domDebuggerAgentPtr));
@@ -172 +172 @@
     }
 
-    runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
-    m_timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
+    runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
+    m_timelineAgent->setPageScriptDebugServer(&debuggerAgent->scriptDebugServer());
 }
 
@@ -398 +398 @@
 }
 
-void InspectorController::resume()
-{
-    if (m_debuggerAgent) {
-        ErrorString unused;
-        m_debuggerAgent->resume(unused);
-    }
-}
-
 bool InspectorController::developerExtrasEnabled() const
 {

branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorController.h

@@ -124 +124 @@
     WEBCORE_EXPORT void setProfilerEnabled(bool);
 
-    void resume();
-
     InspectorClient* inspectorClient() const { return m_inspectorClient; }
     InspectorPageAgent* pageAgent() const { return m_pageAgent; }
@@ -151 +149 @@
     InspectorResourceAgent* m_resourceAgent;
     InspectorPageAgent* m_pageAgent;
-    PageDebuggerAgent* m_debuggerAgent;
     InspectorDOMDebuggerAgent* m_domDebuggerAgent;
     InspectorTimelineAgent* m_timelineAgent;

branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -773 +773 @@
         if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents.inspectorLayerTreeAgent())
             layerTreeAgent->reset();
+
+        if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
+            pageDebuggerAgent->mainFrameNavigated();
     }
 
@@ -803 +806 @@
 void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
 {
+    if (frame.isMainFrame()) {
+        if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
+            pageDebuggerAgent->mainFrameStartedLoading();
+    }
+
     if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
         inspectorPageAgent->frameStartedLoading(frame);
@@ -809 +817 @@
 void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
 {
+    if (frame.isMainFrame()) {
+        if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
+            pageDebuggerAgent->mainFrameStoppedLoading();
+    }
+
     if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
         inspectorPageAgent->frameStoppedLoading(frame);

branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.cpp

@@ -145 +145 @@
 }
 
+void PageDebuggerAgent::mainFrameStartedLoading()
+{
+    if (isPaused()) {
+        setSuppressAllPauses(true);
+        ErrorString unused;
+        resume(unused);
+    }
+}
+
+void PageDebuggerAgent::mainFrameStoppedLoading()
+{
+    setSuppressAllPauses(false);
+}
+
+void PageDebuggerAgent::mainFrameNavigated()
+{
+    setSuppressAllPauses(false);
+}
+
 } // namespace WebCore

branches/safari-601.1.46-branch/Source/WebCore/inspector/PageDebuggerAgent.h

@@ -52 +52 @@
     void didClearMainFrameWindowObject();
 
+    void mainFrameStartedLoading();
+    void mainFrameStoppedLoading();
+    void mainFrameNavigated();
+
     virtual PageScriptDebugServer& scriptDebugServer() override;
 

branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp

@@ -2983 +2983 @@
         return;
 
-    if (Page* page = m_frame.page()) {
-        if (m_frame.isMainFrame())
-            page->inspectorController().resume();
-    }
-
     setProvisionalDocumentLoader(m_policyDocumentLoader.get());
     m_loadType = type;