Changeset 65068 in webkit

Timestamp:

Aug 10, 2010 5:42:37 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-08-10 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector, Chromium: reloading of inspected page hits assert in InspectorController::enableDebuggerFromFrontend()
​https://bugs.webkit.org/show_bug.cgi?id=43780

• inspector/CodeGeneratorInspector.pm:
• inspector/InspectorController.cpp: (WebCore::InspectorController::enableDebuggerFromFrontend):
• inspector/InspectorController.h: (WebCore::InspectorController::hasFrontend):
• inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::create): (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent): (WebCore::InspectorDebuggerAgent::setPauseOnExceptionsState): (WebCore::InspectorDebuggerAgent::didParseSource): (WebCore::InspectorDebuggerAgent::failedToParseSource): (WebCore::InspectorDebuggerAgent::didPause): (WebCore::InspectorDebuggerAgent::didContinue):
• inspector/InspectorDebuggerAgent.h:

2010-08-10 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector, Chromium: reloading of inspected page hits assert in InspectorController::enableDebuggerFromFrontend()
​https://bugs.webkit.org/show_bug.cgi?id=43780

• src/WebDevToolsAgentImpl.cpp: (WebKit::WebDevToolsAgentImpl::setRuntimeFeatureEnabled):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/CodeGeneratorInspector.pm (modified) (2 diffs)
• WebCore/inspector/InspectorController.cpp (modified) (1 diff)
• WebCore/inspector/InspectorController.h (modified) (1 diff)
• WebCore/inspector/InspectorDebuggerAgent.cpp (modified) (8 diffs)
• WebCore/inspector/InspectorDebuggerAgent.h (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebDevToolsAgentImpl.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-10  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector, Chromium: reloading of inspected page hits assert in InspectorController::enableDebuggerFromFrontend()
+        https://bugs.webkit.org/show_bug.cgi?id=43780
+
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::enableDebuggerFromFrontend):
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::hasFrontend):
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::create):
+        (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
+        (WebCore::InspectorDebuggerAgent::setPauseOnExceptionsState):
+        (WebCore::InspectorDebuggerAgent::didParseSource):
+        (WebCore::InspectorDebuggerAgent::failedToParseSource):
+        (WebCore::InspectorDebuggerAgent::didPause):
+        (WebCore::InspectorDebuggerAgent::didContinue):
+        * inspector/InspectorDebuggerAgent.h:
+
 2010-08-10  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebCore/inspector/CodeGeneratorInspector.pm

@@ -207 +207 @@
     my @backendHead;
     push(@backendHead, "    ${backendClassName}(InspectorController* inspectorController) : m_inspectorController(inspectorController) { }");
-    push(@backendHead, "    RemoteInspectorFrontend* inspectorFrontend() const { return m_inspectorController->remoteInspectorFrontend(); }");
     push(@backendHead, "    void reportProtocolError(const long callId, const String& method, const String& errorText) const;");
     push(@backendHead, "    void dispatch(const String& message);");
@@ -353 +352 @@
         push(@function, "");
         push(@function, "    // use InspectorFrontend as a marker of WebInspector availability");
-        push(@function, "    if (m_inspectorController->remoteInspectorFrontend()) {");
+        push(@function, "    if (m_inspectorController->hasFrontend()) {");
         push(@function, "        RefPtr<InspectorArray> arguments = InspectorArray::create();");
         push(@function, "        arguments->pushString(\"processResponse\");");

trunk/WebCore/inspector/InspectorController.cpp

@@ -1625 +1625 @@
     ASSERT(m_inspectedPage);
 
-    m_debuggerAgent = InspectorDebuggerAgent::create(this);
+    m_debuggerAgent = InspectorDebuggerAgent::create(this, m_remoteFrontend.get());
 
     m_remoteFrontend->debuggerWasEnabled();

trunk/WebCore/inspector/InspectorController.h

@@ -208 +208 @@
     const ResourcesMap& resources() const { return m_resources; }
     InspectorResource* resourceForURL(const String& url);
-    RemoteInspectorFrontend* remoteInspectorFrontend() { return m_remoteFrontend.get(); }
+    bool hasFrontend() const { return m_remoteFrontend; }
 
     void drawNodeHighlight(GraphicsContext&) const;

trunk/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -47 +47 @@
 }
 
-PassOwnPtr<InspectorDebuggerAgent> InspectorDebuggerAgent::create(InspectorController* inspectorController)
-{
-    OwnPtr<InspectorDebuggerAgent> agent = adoptPtr(new InspectorDebuggerAgent(inspectorController));
+PassOwnPtr<InspectorDebuggerAgent> InspectorDebuggerAgent::create(InspectorController* inspectorController, RemoteInspectorFrontend* remoteFrontend)
+{
+    OwnPtr<InspectorDebuggerAgent> agent = adoptPtr(new InspectorDebuggerAgent(inspectorController, remoteFrontend));
     ScriptDebugServer::shared().clearBreakpoints();
     ScriptDebugServer::shared().addListener(agent.get(), inspectorController->inspectedPage());
@@ -55 +55 @@
 }
 
-InspectorDebuggerAgent::InspectorDebuggerAgent(InspectorController* inspectorController)
+InspectorDebuggerAgent::InspectorDebuggerAgent(InspectorController* inspectorController, RemoteInspectorFrontend* remoteFrontend)
     : m_inspectorController(inspectorController)
+    , m_remoteFrontend(remoteFrontend)
     , m_pausedScriptState(0)
     , m_breakpointsLoaded(false)
@@ -167 +168 @@
 {
     ScriptDebugServer::shared().setPauseOnExceptionsState(static_cast<ScriptDebugServer::PauseOnExceptionsState>(pauseState));
-    if (remoteFrontend())
-        remoteFrontend()->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
+    m_remoteFrontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
 }
 
@@ -247 +247 @@
 {
     // Don't send script content to the front end until it's really needed.
-    remoteFrontend()->parsedScriptSource(sourceID, url, "", firstLine, worldType);
+    m_remoteFrontend->parsedScriptSource(sourceID, url, "", firstLine, worldType);
 
     m_scriptIDToContent.set(sourceID, data);
@@ -265 +265 @@
             if (!success)
                 continue;
-            remoteFrontend()->restoredBreakpoint(sourceID, url, actualLineNumber, breakpointIt->second.enabled, breakpointIt->second.condition);
+            m_remoteFrontend->restoredBreakpoint(sourceID, url, actualLineNumber, breakpointIt->second.enabled, breakpointIt->second.condition);
             String breakpointId = formatBreakpointId(sourceID, actualLineNumber);
             m_breakpointsMapping.set(breakpointId, lineNumber);
@@ -275 +275 @@
 void InspectorDebuggerAgent::failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage)
 {
-    remoteFrontend()->failedToParseScriptSource(url, data, firstLine, errorLine, errorMessage);
+    m_remoteFrontend->failedToParseScriptSource(url, data, firstLine, errorLine, errorMessage);
 }
 
@@ -283 +283 @@
     m_pausedScriptState = scriptState;
     RefPtr<InspectorValue> callFrames = currentCallFrames();
-    remoteFrontend()->pausedScript(callFrames.get());
+    m_remoteFrontend->pausedScript(callFrames.get());
 }
 
@@ -289 +289 @@
 {
     m_pausedScriptState = 0;
-    remoteFrontend()->resumedScript();
-}
-
-RemoteInspectorFrontend* InspectorDebuggerAgent::remoteFrontend() const
-{
-    return m_inspectorController->remoteInspectorFrontend();
+    m_remoteFrontend->resumedScript();
 }
 

trunk/WebCore/inspector/InspectorDebuggerAgent.h

@@ -48 +48 @@
 class InspectorDebuggerAgent : public ScriptDebugListener, public Noncopyable {
 public:
-    static PassOwnPtr<InspectorDebuggerAgent> create(InspectorController*);
+    static PassOwnPtr<InspectorDebuggerAgent> create(InspectorController*, RemoteInspectorFrontend*);
     virtual ~InspectorDebuggerAgent();
 
@@ -74 +74 @@
 
 private:
-    InspectorDebuggerAgent(InspectorController*);
+    InspectorDebuggerAgent(InspectorController*, RemoteInspectorFrontend*);
 
     PassRefPtr<InspectorValue> currentCallFrames();
@@ -86 +86 @@
     virtual void didContinue();
 
-    RemoteInspectorFrontend* remoteFrontend() const;
-
     InspectorController* m_inspectorController;
+    RemoteInspectorFrontend* m_remoteFrontend;
     ScriptState* m_pausedScriptState;
     HashMap<String, String> m_sourceIDToURL;

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-08-10  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector, Chromium: reloading of inspected page hits assert in InspectorController::enableDebuggerFromFrontend()
+        https://bugs.webkit.org/show_bug.cgi?id=43780
+
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::setRuntimeFeatureEnabled):
+
 2010-08-10  Hans Wennborg  <hans@chromium.org>
 

trunk/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

@@ -305 +305 @@
         else
           ic->disableResourceTracking(false /* not sticky */);
-    } else if (feature == kFrontendConnectedFeatureName && enabled)
+    } else if (feature == kFrontendConnectedFeatureName && enabled && !inspectorController()->hasFrontend())
         frontendLoaded();
 }