Changeset 95634 in webkit

Timestamp:

Sep 21, 2011 8:39:53 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: add minimal error handling to the DOM breakpoints.
​https://bugs.webkit.org/show_bug.cgi?id=68537

Reviewed by Yury Semikhatsky.

• inspector/InspectorDOMAgent.h:
• inspector/InspectorDOMDebuggerAgent.cpp:

(WebCore::domTypeForName):
(WebCore::InspectorDOMDebuggerAgent::setDOMBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeDOMBreakpoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDOMAgent.h (modified) (2 diffs)
• inspector/InspectorDOMDebuggerAgent.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-21  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: add minimal error handling to the DOM breakpoints.
+        https://bugs.webkit.org/show_bug.cgi?id=68537
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/InspectorDOMAgent.h:
+        * inspector/InspectorDOMDebuggerAgent.cpp:
+        (WebCore::domTypeForName):
+        (WebCore::InspectorDOMDebuggerAgent::setDOMBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::removeDOMBreakpoint):
+
 2011-09-21  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.h

@@ -181 +181 @@
     static bool isWhitespace(Node*);
 
+    Node* assertNode(ErrorString*, int nodeId);
+
 private:
     InspectorDOMAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorClient*, InspectorState*, InjectedScriptManager*);
@@ -192 +194 @@
     int bind(Node*, NodeToIdMap*);
     void unbind(Node*, NodeToIdMap*);
-    Node* assertNode(ErrorString*, int nodeId);
     Element* assertElement(ErrorString*, int nodeId);
     HTMLElement* assertHTMLElement(ErrorString*, int nodeId);

trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp

@@ -179 +179 @@
 }
 
-static int domTypeForName(const String& typeString)
+static int domTypeForName(ErrorString* errorString, const String& typeString)
 {
     if (typeString == "subtree-modified")
@@ -187 +187 @@
     if (typeString == "node-removed")
         return NodeRemoved;
-    return SubtreeModified;
+    *errorString = makeString("Unknown DOM breakpoint type: ", typeString);
+    return -1;
 }
 
@@ -201 +202 @@
 }
 
-void InspectorDOMDebuggerAgent::setDOMBreakpoint(ErrorString*, int nodeId, const String& typeString)
-{
-    Node* node = m_domAgent->nodeForId(nodeId);
+void InspectorDOMDebuggerAgent::setDOMBreakpoint(ErrorString* errorString, int nodeId, const String& typeString)
+{
+    Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
-    int type = domTypeForName(typeString);
+
+    int type = domTypeForName(errorString, typeString);
+    if (type == -1)
+        return;
 
     uint32_t rootBit = 1 << type;
@@ -216 +220 @@
 }
 
-void InspectorDOMDebuggerAgent::removeDOMBreakpoint(ErrorString*, int nodeId, const String& typeString)
-{
-    Node* node = m_domAgent->nodeForId(nodeId);
+void InspectorDOMDebuggerAgent::removeDOMBreakpoint(ErrorString* errorString, int nodeId, const String& typeString)
+{
+    Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
-    int type = domTypeForName(typeString);
+    int type = domTypeForName(errorString, typeString);
+    if (type == -1)
+        return;
 
     uint32_t rootBit = 1 << type;