Changeset 76581 in webkit

Timestamp:

Jan 25, 2011 1:44:30 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-01-24 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: debugger and browser debugger agents should manage sticky breakpoints independently.
​https://bugs.webkit.org/show_bug.cgi?id=52999

• inspector/Inspector.idl:
• inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::didCommitLoad): (WebCore::InspectorAgent::enableDebugger): (WebCore::InspectorAgent::inspectedURLWithoutFragment):
• inspector/InspectorAgent.h:
• inspector/InspectorBrowserDebuggerAgent.cpp: (WebCore::InspectorBrowserDebuggerAgent::setAllBrowserBreakpoints): (WebCore::InspectorBrowserDebuggerAgent::inspectedURLChanged): (WebCore::InspectorBrowserDebuggerAgent::restoreStickyBreakpoint):
• inspector/InspectorBrowserDebuggerAgent.h:
• inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent): (WebCore::InspectorDebuggerAgent::setAllJavaScriptBreakpoints): (WebCore::InspectorDebuggerAgent::inspectedURLChanged): (WebCore::InspectorDebuggerAgent::restoreBreakpoints):
• inspector/InspectorDebuggerAgent.h:
• inspector/InspectorState.cpp: (WebCore::InspectorState::InspectorState):
• inspector/InspectorState.h:
• inspector/front-end/BreakpointManager.js: (WebInspector.BreakpointManager): (WebInspector.BreakpointManager.prototype._projectChanged): (WebInspector.BreakpointManager.prototype._saveBreakpoints): (WebInspector.BreakpointManager.prototype._pushBreakpointsToBackend):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.idl (modified) (2 diffs)
• inspector/InspectorAgent.cpp (modified) (3 diffs)
• inspector/InspectorAgent.h (modified) (1 diff)
• inspector/InspectorBrowserDebuggerAgent.cpp (modified) (5 diffs)
• inspector/InspectorBrowserDebuggerAgent.h (modified) (2 diffs)
• inspector/InspectorDebuggerAgent.cpp (modified) (4 diffs)
• inspector/InspectorDebuggerAgent.h (modified) (4 diffs)
• inspector/InspectorState.cpp (modified) (1 diff)
• inspector/InspectorState.h (modified) (1 diff)
• inspector/front-end/BreakpointManager.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-24  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: debugger and browser debugger agents should manage sticky breakpoints independently.
+        https://bugs.webkit.org/show_bug.cgi?id=52999
+
+        * inspector/Inspector.idl:
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::didCommitLoad):
+        (WebCore::InspectorAgent::enableDebugger):
+        (WebCore::InspectorAgent::inspectedURLWithoutFragment):
+        * inspector/InspectorAgent.h:
+        * inspector/InspectorBrowserDebuggerAgent.cpp:
+        (WebCore::InspectorBrowserDebuggerAgent::setAllBrowserBreakpoints):
+        (WebCore::InspectorBrowserDebuggerAgent::inspectedURLChanged):
+        (WebCore::InspectorBrowserDebuggerAgent::restoreStickyBreakpoint):
+        * inspector/InspectorBrowserDebuggerAgent.h:
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
+        (WebCore::InspectorDebuggerAgent::setAllJavaScriptBreakpoints):
+        (WebCore::InspectorDebuggerAgent::inspectedURLChanged):
+        (WebCore::InspectorDebuggerAgent::restoreBreakpoints):
+        * inspector/InspectorDebuggerAgent.h:
+        * inspector/InspectorState.cpp:
+        (WebCore::InspectorState::InspectorState):
+        * inspector/InspectorState.h:
+        * inspector/front-end/BreakpointManager.js:
+        (WebInspector.BreakpointManager):
+        (WebInspector.BreakpointManager.prototype._projectChanged):
+        (WebInspector.BreakpointManager.prototype._saveBreakpoints):
+        (WebInspector.BreakpointManager.prototype._pushBreakpointsToBackend):
+
 2011-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/inspector/Inspector.idl

@@ -243 +243 @@
         [domain=Inspector] void disableDebugger(in boolean always);
 
-        [domain=Inspector] void setAllBrowserBreakpoints(in Object breakpoints);
-
         [notify, domain=Debugger] void debuggerWasEnabled();
         [notify, domain=Debugger] void debuggerWasDisabled();
@@ -254 +252 @@
         [domain=Debugger] void deactivateBreakpoints();
 
+        [domain=Debugger] void setAllJavaScriptBreakpoints(in Object breakpoints);
         [domain=Debugger] void setBreakpoint(in Object breakpoint, out String breakpointId, out long actualLineNumber, out long actualColumnNumber);
         [domain=Debugger] void removeBreakpoint(in String breakpointId);
 
+        [domain=BrowserDebugger] void setAllBrowserBreakpoints(in Object breakpoints);
         [domain=BrowserDebugger] void setDOMBreakpoint(in long nodeId, in long type);
         [domain=BrowserDebugger] void removeDOMBreakpoint(in long nodeId, in long type);

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -645 +645 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         if (m_debuggerAgent) {
-            m_debuggerAgent->clearForPageNavigation();
+            KURL url = inspectedURLWithoutFragment();
+            m_debuggerAgent->inspectedURLChanged(url);
             if (m_browserDebuggerAgent)
-                m_browserDebuggerAgent->inspectedURLChanged(inspectedURL());
+                m_browserDebuggerAgent->inspectedURLChanged(url);
         }
 #endif
@@ -1053 +1054 @@
     m_debuggerAgent = InspectorDebuggerAgent::create(this, m_frontend.get());
     m_browserDebuggerAgent = InspectorBrowserDebuggerAgent::create(this);
-    m_browserDebuggerAgent->inspectedURLChanged(inspectedURL());
 
     m_frontend->debuggerWasEnabled();
@@ -1391 +1391 @@
 }
 
+KURL InspectorAgent::inspectedURLWithoutFragment() const
+{
+    KURL url = inspectedURL();
+    url.removeFragmentIdentifier();
+    return url;
+}
+
 void InspectorAgent::reloadPage()
 {

trunk/Source/WebCore/inspector/InspectorAgent.h

@@ -129 +129 @@
     Page* inspectedPage() const { return m_inspectedPage; }
     KURL inspectedURL() const;
+    KURL inspectedURLWithoutFragment() const;
     void reloadPage();
 

trunk/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp

@@ -72 +72 @@
 }
 
-void InspectorBrowserDebuggerAgent::inspectedURLChanged(const KURL& url)
+void InspectorBrowserDebuggerAgent::setAllBrowserBreakpoints(PassRefPtr<InspectorObject> breakpoints)
+{
+    m_inspectorAgent->state()->setObject(InspectorState::browserBreakpoints, breakpoints);
+    inspectedURLChanged(m_inspectorAgent->inspectedURLWithoutFragment());
+}
+
+void InspectorBrowserDebuggerAgent::inspectedURLChanged(const String& url)
 {
     m_eventListenerBreakpoints.clear();
@@ -79 +85 @@
 
     RefPtr<InspectorObject> allBreakpoints = m_inspectorAgent->state()->getObject(InspectorState::browserBreakpoints);
-    KURL urlCopy = url;
-    urlCopy.removeFragmentIdentifier();
-    RefPtr<InspectorArray> breakpoints = allBreakpoints->getArray(urlCopy);
+    RefPtr<InspectorArray> breakpoints = allBreakpoints->getArray(url);
     if (!breakpoints)
         return;
@@ -90 +94 @@
 void InspectorBrowserDebuggerAgent::restoreStickyBreakpoint(PassRefPtr<InspectorObject> breakpoint)
 {
-    DEFINE_STATIC_LOCAL(String, eventListenerBreakpointType, ("EventListener"));
-    DEFINE_STATIC_LOCAL(String, javaScriptBreakpointType, ("JS"));
-    DEFINE_STATIC_LOCAL(String, xhrBreakpointType, ("XHR"));
-
     if (!breakpoint)
         return;
@@ -106 +106 @@
         return;
 
-    if (type == eventListenerBreakpointType) {
+    if (type == eventListenerNativeBreakpointType) {
         if (!enabled)
             return;
@@ -113 +113 @@
             return;
         setEventListenerBreakpoint(eventName);
-    } else if (type == javaScriptBreakpointType && m_inspectorAgent->debuggerAgent()) {
-        String url;
-        if (!condition->getString("url", &url))
-            return;
-        double lineNumber;
-        if (!condition->getNumber("lineNumber", &lineNumber))
-            return;
-        double columnNumber;
-        if (!condition->getNumber("columnNumber", &columnNumber))
-            return;
-        String javaScriptCondition;
-        if (!condition->getString("condition", &javaScriptCondition))
-            return;
-        m_inspectorAgent->debuggerAgent()->setStickyBreakpoint(url, ScriptBreakpoint(long(lineNumber), long(columnNumber), javaScriptCondition, enabled));
-    } else if (type == xhrBreakpointType) {
+    } else if (type == xhrNativeBreakpointType) {
         if (!enabled)
             return;

trunk/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h

@@ -47 +47 @@
 class InspectorAgent;
 class InspectorObject;
-class KURL;
 class Node;
 
@@ -60 +59 @@
     virtual ~InspectorBrowserDebuggerAgent();
 
-    void inspectedURLChanged(const KURL&);
+    void setAllBrowserBreakpoints(PassRefPtr<InspectorObject>);
+    void inspectedURLChanged(const String& url);
 
     // BrowserDebugger API for InspectorFrontend

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -35 +35 @@
 #include "InjectedScriptHost.h"
 #include "InspectorFrontend.h"
+#include "InspectorState.h"
 #include "InspectorValues.h"
 #include "PlatformString.h"
@@ -56 +57 @@
     , m_pausedScriptState(0)
     , m_javaScriptPauseScheduled(false)
+    , m_breakpointsRestored(false)
 {
 }
@@ -78 +80 @@
 {
     ScriptDebugServer::shared().deactivateBreakpoints();
+}
+
+void InspectorDebuggerAgent::setAllJavaScriptBreakpoints(PassRefPtr<InspectorObject> breakpoints)
+{
+    m_inspectorAgent->state()->setObject(InspectorState::javaScriptBreakpoints, breakpoints);
+    if (!m_breakpointsRestored) {
+        restoreBreakpoints(m_inspectorAgent->inspectedURLWithoutFragment());
+        m_breakpointsRestored = true;
+    }
+}
+
+void InspectorDebuggerAgent::inspectedURLChanged(const String& url)
+{
+    m_scriptIDToContent.clear();
+    m_urlToSourceIDs.clear();
+    restoreBreakpoints(url);
+}
+
+void InspectorDebuggerAgent::restoreBreakpoints(const String& inspectedURL)
+{
+    m_stickyBreakpoints.clear();
+
+    RefPtr<InspectorObject> allBreakpoints = m_inspectorAgent->state()->getObject(InspectorState::javaScriptBreakpoints);
+    RefPtr<InspectorArray> breakpoints = allBreakpoints->getArray(inspectedURL);
+    if (!breakpoints)
+        return;
+    for (unsigned i = 0; i < breakpoints->length(); ++i) {
+        RefPtr<InspectorObject> breakpoint = breakpoints->get(i)->asObject();
+        if (!breakpoint)
+            continue;
+        String url;
+        if (!breakpoint->getString("url", &url))
+            continue;
+        double lineNumber;
+        if (!breakpoint->getNumber("lineNumber", &lineNumber))
+            continue;
+        double columnNumber;
+        if (!breakpoint->getNumber("columnNumber", &columnNumber))
+            return;
+        String condition;
+        if (!breakpoint->getString("condition", &condition))
+            continue;
+        bool enabled;
+        if (!breakpoint->getBoolean("enabled", &enabled))
+            continue;
+        ScriptBreakpoint scriptBreakpoint((long) lineNumber, (long) columnNumber, condition, enabled);
+        setStickyBreakpoint(url, scriptBreakpoint);
+    }
 }
 
@@ -214 +264 @@
 }
 
-void InspectorDebuggerAgent::clearForPageNavigation()
-{
-    m_scriptIDToContent.clear();
-    m_urlToSourceIDs.clear();
-    m_stickyBreakpoints.clear();
-}
-
 PassRefPtr<InspectorValue> InspectorDebuggerAgent::currentCallFrames()
 {

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

@@ -63 +63 @@
     static bool isDebuggerAlwaysEnabled();
 
+    void setAllJavaScriptBreakpoints(PassRefPtr<InspectorObject>);
+    void inspectedURLChanged(const String& url);
+
     // Part of the protocol.
     void activateBreakpoints();
@@ -83 +86 @@
     void getCompletionsOnCallFrame(PassRefPtr<InspectorObject> callFrameId, const String& expression, bool includeInspectorCommandLineAPI, RefPtr<InspectorValue>* result);
 
-    void clearForPageNavigation();
-
 private:
     InspectorDebuggerAgent(InspectorAgent*, InspectorFrontend*);
@@ -95 +96 @@
     virtual void didContinue();
 
+    void restoreBreakpoints(const String& inspectedURL);
     void restoreBreakpoint(const String& sourceID, const ScriptBreakpoint&);
 
@@ -110 +112 @@
     RefPtr<InspectorObject> m_breakProgramDetails;
     bool m_javaScriptPauseScheduled;
+    bool m_breakpointsRestored;
 };
 

trunk/Source/WebCore/inspector/InspectorState.cpp

@@ -43 +43 @@
     registerBoolean(timelineProfilerEnabled, false);
     registerBoolean(searchingForNode, false);
+    registerObject(javaScriptBreakpoints);
     registerObject(browserBreakpoints);
     registerBoolean(consoleMessagesEnabled, false);

trunk/Source/WebCore/inspector/InspectorState.h

@@ -50 +50 @@
         consoleMessagesEnabled,
         userInitiatedProfiling,
+        javaScriptBreakpoints,
         browserBreakpoints,
         resourceAgentEnabled,

trunk/Source/WebCore/inspector/front-end/BreakpointManager.js

@@ -35 +35 @@
     for (var projectId in breakpoints)
         this._stickyBreakpoints[projectId] = this._validateBreakpoints(breakpoints[projectId]);
-    InspectorBackend.setAllBrowserBreakpoints(this._stickyBreakpoints);
 
     this._breakpoints = {};
@@ -245 +244 @@
             else if (breakpoint.type === WebInspector.BreakpointManager.BreakpointTypes.XHR)
                 this._createXHRBreakpoint(breakpoint.condition.url, breakpoint.enabled, true);
+        }
+
+        if (!this._breakpointsPushedToFrontend) {
+            this._pushBreakpointsToBackend();
+            this._breakpointsPushedToFrontend = true;
         }
     },
@@ -304 +308 @@
 
         this._stickyBreakpoints[WebInspector.settings.projectId] = breakpoints;
-        InspectorBackend.setAllBrowserBreakpoints(this._stickyBreakpoints);
+        this._pushBreakpointsToBackend();
+    },
+
+    _pushBreakpointsToBackend: function()
+    {
+        var allJavaScriptBreakpoints = {};
+        var allBrowserBreakpoints = {};
+        for (var projectId in this._stickyBreakpoints) {
+            var breakpoints = this._stickyBreakpoints[projectId];
+            var javaScriptBreakpoints = [];
+            var browserBreakpoints = [];
+            for (var i = 0; i < breakpoints.length; ++i) {
+                if (breakpoints[i].type == WebInspector.BreakpointManager.BreakpointTypes.JS) {
+                    var data = {};
+                    data.enabled = breakpoints[i].enabled;
+                    for (var p in breakpoints[i].condition)
+                        data[p] = breakpoints[i].condition[p];
+                    javaScriptBreakpoints.push(data);
+                } else
+                    browserBreakpoints.push(breakpoints[i]);
+            }
+            if (javaScriptBreakpoints.length)
+                allJavaScriptBreakpoints[projectId] = javaScriptBreakpoints;
+            if (browserBreakpoints.length)
+                allBrowserBreakpoints[projectId] = browserBreakpoints;
+        }
+        InspectorBackend.setAllJavaScriptBreakpoints(allJavaScriptBreakpoints);
+        InspectorBackend.setAllBrowserBreakpoints(allBrowserBreakpoints);
     },